Merge 1.14

This commit is contained in:
Vincent Lee committed 2020-02-20 21:00:55 -06:00
commit a6cf5653dc
2298 files changed
+44061 -14763

No files matched your search

@@ -39,7 +39,9 @@ import vazkii.botania.api.item.IExoflameHeatable;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.common.advancements.AlfPortalTrigger;
import vazkii.botania.common.advancements.AlfPortalBreadTrigger;
import vazkii.botania.common.advancements.CorporeaRequestTrigger;
import vazkii.botania.common.advancements.LokiPlaceTrigger;
import vazkii.botania.common.advancements.ManaGunTrigger;
import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger;
import vazkii.botania.common.advancements.RelicBindTrigger;
@@ -215,6 +217,8 @@ public class Botania {
CriteriaTriggers.register(RelicBindTrigger.INSTANCE);
CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE);
CriteriaTriggers.register(ManaGunTrigger.INSTANCE);
CriteriaTriggers.register(LokiPlaceTrigger.INSTANCE);
CriteriaTriggers.register(AlfPortalBreadTrigger.INSTANCE);
CraftingHelper.register(FluxfieldCondition.SERIALIZER);