fix merge conflicts

DaFuqs · Feb 24, 2025 · abd7bbb · abd7bbb
1 parent 455860c
commit abd7bbb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java
@@ -26,7 +26,7 @@
 import de.dafuqs.spectrum.items.misc.*;
 import de.dafuqs.spectrum.items.tools.*;
 import de.dafuqs.spectrum.items.trinkets.*;
-import de.dafuqs.spectrum.particle.*;
+import de.dafuqs.spectrum.particle.effect.*;
 import de.dafuqs.spectrum.recipe.pedestal.*;
 import net.fabricmc.fabric.api.registry.*;
 import net.fabricmc.fabric.api.transfer.v1.fluid.*;
@@ -579,7 +579,7 @@ public static void register() {
 		registerMusicDisks();
 		registerTechnicalItems();
 
-		DEFERRER.flush();
+		REGISTRAR.flush();
 	}
 
 	public static void registerMusicDisks() {