Merge branch 'master' into 1.21.2

# Conflicts: # src/main/java/net/frozenblock/lib/block/api/FrozenCeilingHangingSignBlock.java # src/main/java/net/frozenblock/lib/block/api/FrozenSignBlock.java # src/main/java/net/frozenblock/lib/block/api/FrozenWallHangingSignBlock.java # src/main/java/net/frozenblock/lib/block/api/FrozenWallSignBlock.java # src/main/java/net/frozenblock/lib/item/api/HeavyItemDamageRegistry.java # src/main/java/net/frozenblock/lib/recipe/mixin/ItemValueMixin.java # src/main/java/net/frozenblock/lib/stencil/api/StencilRenderer.java
FrozenBlock · Jan 2, 2025 · fee0279 · fee0279
2 parents a2f36c9 + ac21f81
commit fee0279
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -256,7 +256,7 @@ dependencies {
 
     // ExJson
     //relocModApi("org.exjson:xjs-data:$xjs_data_version")
-    relocModApi("com.github.Treetrain1:xjs-data:infinity-compat-SNAPSHOT")
+    relocModApi("com.github.Treetrain1:xjs-data:f39681b4bb")
     relocModApi("org.exjson:xjs-compat:$xjs_compat_version")
     relocModApi("com.personthecat:fresult:$fresult_version")
     compileOnly("org.projectlombok:lombok:1.18.34")?.let { annotationProcessor(it) }