Merge branch '1.19' of github.com:quiqueck/BetterEnd into 1.19

 Conflicts:
	src/main/java/org/betterx/betterend/integration/EnderscapeIntegration.java
This commit is contained in:
Frank 2022-06-09 16:56:42 +02:00
commit 34fd95ac11
420 changed files with 6494 additions and 5302 deletions

View file

@ -1,11 +1,5 @@
package org.betterx.betterend.integration;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.fabricmc.loader.api.FabricLoader;
import org.betterx.bclib.api.v2.ModIntegrationAPI;
import org.betterx.bclib.integration.ModIntegration;
import org.betterx.bclib.recipes.GridRecipe;
@ -16,6 +10,12 @@ import org.betterx.betterend.integration.byg.BYGIntegration;
import org.betterx.betterend.item.GuideBookItem;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.fabricmc.loader.api.FabricLoader;
public class Integrations {
public static final ModIntegration BYG = ModIntegrationAPI.register(new BYGIntegration());
public static final ModIntegration NOURISH = ModIntegrationAPI.register(new NourishIntegration());