mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-20 03:59:55 +00:00
More ec2 mappings (#124)
* Replace ore dictionary bus Extra Cells ore dict bus -> export bus w/ ore dict card (retains ore filter setting, not verified they are 1:1) * Add OpenComputer migration Moves migration to postInit, and migrates OC upgrades. * Remap wireless w/ correct encryption key + power Basically now works without needing to relink in security term * Update buildscript * spotless apply * spotlessApply (#125) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
212 files changed
+1034
-1039
No files matched your search
@@ -6,11 +6,11 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.glodblock.github.util.RenderUtil;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.client.lib.UtilsFX;
|
||||
|
||||
import com.glodblock.github.util.RenderUtil;
|
||||
|
||||
public class AspectRender {
|
||||
|
||||
public static final ResourceLocation UNKNOWN_TEXTURE = new ResourceLocation(
|
||||
|
||||
@@ -9,6 +9,8 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.apache.commons.lang3.tuple.MutablePair;
|
||||
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.util.item.AEFluidStack;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.IEssentiaContainerItem;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
@@ -16,8 +18,6 @@ import thaumicenergistics.api.storage.IAspectStack;
|
||||
import thaumicenergistics.common.fluids.GaseousEssentia;
|
||||
import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper;
|
||||
import thaumicenergistics.common.storage.AspectStack;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.util.item.AEFluidStack;
|
||||
|
||||
public class AspectUtil {
|
||||
|
||||
|
||||
Reference in new issue
Block a user