change: conflicts flashback <=0.20.1

ishland · ishland · commit 3d79cdd9f969 · 2025-03-31T14:44:26.000+08:00
Backport of 7dbb14e
diff --git a/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/fixes/MixinServerWorld.java b/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/fixes/MixinServerWorld.java
diff --git a/c2me-rewrites-chunk-system/src/main/resources/c2me-rewrites-chunk-system.mixins.json b/c2me-rewrites-chunk-system/src/main/resources/c2me-rewrites-chunk-system.mixins.json
@@ -22,7 +22,6 @@
     "async_serialization.MixinStorageIoWorker",
     "async_serialization.MixinThreadedAnvilChunkStorage",
     "fixes.MixinServerEntityManager",
-    "fixes.MixinServerWorld",
     "fluid_postprocessing.MixinWorldChunk"
   ]
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -32,7 +32,8 @@
   },
   "conflicts": {
     "dynview": "*",
-    "betterchunkloading": "*"
+    "betterchunkloading": "*",
+    "flashback": "<=0.20.1"
   },
   "breaks": {
     "tic_tacs": "*",

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`"async_serialization.MixinStorageIoWorker",`
`23`	`23`	`"async_serialization.MixinThreadedAnvilChunkStorage",`
`24`	`24`	`"fixes.MixinServerEntityManager",`
`25`		`- "fixes.MixinServerWorld",`
`26`	`25`	`"fluid_postprocessing.MixinWorldChunk"`
`27`	`26`	`]`
`28`	`27`	`}`