diff --git a/Forge/build.gradle b/Forge/build.gradle
index 426300957c..9cd4e8e1d3 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -142,6 +142,11 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             property 'hexcasting.xplat_datagen', 'true'
+            
+            // disable the System.exit(0) at the end of the ForgeGradle datagen so Gradle stops thinking it failed
+            // see: https://github.com/MinecraftForge/ForgeGradle/pull/686
+            forceExit false
+            
             mods {
                 create(modID) {
                     source sourceSets.main
@@ -159,6 +164,7 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             property 'hexcasting.forge_datagen', 'true'
+            forceExit false
             mods {
                 create(modID) {
                     source sourceSets.main
diff --git a/Forge/gradle.properties b/Forge/gradle.properties
index 3dcf2ae014..57a5c0f489 100644
--- a/Forge/gradle.properties
+++ b/Forge/gradle.properties
@@ -1,4 +1,4 @@
-forgeVersion=47.1.43
+forgeVersion=47.1.47
 
 kotlinForForgeVersion=4.3.0
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 5acae7592a..5c470c0fd3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,6 +24,22 @@ pipeline {
                 sh './gradlew build'
             }
         }
+        stage('Run Datagen') {
+            steps {
+                echo 'Running datagen tasks'
+                sh './gradlew runAllDatagen'
+            }
+        }
+        stage('Check Datagen') {
+            steps {
+                echo 'Checking for modified files'
+                // also fail if there are new untracked files
+                sh 'git add --intent-to-add .'
+                // cache isn't reproducible, so ignore modifications to it
+                // https://stackoverflow.com/a/71878316
+                sh 'git diff --name-only --exit-code -- ":!:*/src/generated/resources/.cache/*"'
+            }
+        }
         stage('Publish') {
             when {
                 anyOf {
diff --git a/build.gradle b/build.gradle
index 4caf6f5f1c..4c93acbdcc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,3 +86,9 @@ compileTestKotlin {
         jvmTarget = "17"
     }
 }
+
+tasks.register("runAllDatagen") {
+    dependsOn ":Forge:runXplatDatagen"
+    dependsOn ":Forge:runForgeDatagen"
+    dependsOn ":Fabric:runDatagen"
+}
diff --git a/gradle.properties b/gradle.properties
index 79efc457a6..d8828e7c16 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinVersion=1.7.20
 modVersion=0.11.1-7
 
 paucalVersion=0.6.0
-patchouliVersion=82
+patchouliVersion=83
 
 jeiVersion=15.0.0.12
 pehkuiVersion=3.7.7