diff --git a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java index b223f0fcd..5fac43332 100644 --- a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java +++ b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java @@ -28,6 +28,8 @@ public enum Mixins implements IMixins { THAUMCRAFT(new MixinBuilder() .addClientMixins("thaumcraft.ClientTickEventsFMLMixin") .setPhase(Phase.LATE) + // salis arcana implements the same mixin so our fails + .addExcludedMod(TargetedMod.SALISARCANA) .addRequiredMod(TargetedMod.THAUMCRAFT)), NEI(new MixinBuilder() .addCommonMixins("nei.RecipeInfoMixin") diff --git a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java index 59755b4e2..f1bf0578d 100644 --- a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java +++ b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java @@ -6,6 +6,7 @@ public enum TargetedMod implements ITargetMod { + SALISARCANA("salisarcana"), THAUMCRAFT("Thaumcraft"), NEI("NotEnoughItems");