diff options
Diffstat (limited to 'src/main/java/com')
97 files changed, 650 insertions, 555 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java index c3758674f5..c7f7574d21 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; + import gregtech.api.enums.OrePrefixes; public class GtppAtomLoader { diff --git a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java index 6b3d313eb3..bb745216d3 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java @@ -6,16 +6,6 @@ import java.io.IOException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import li.cil.oc.Settings; -import li.cil.oc.api.Driver; -import li.cil.oc.api.driver.Item; -import li.cil.oc.api.driver.item.Memory; -import li.cil.oc.api.machine.Architecture; -import li.cil.oc.api.machine.ExecutionResult; -import li.cil.oc.api.machine.Machine; -import li.cil.oc.api.machine.Signal; -import li.cil.oc.common.SaveHandler; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +22,16 @@ import com.github.technus.avrClone.memory.program.ProgramMemory; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.Converter; +import li.cil.oc.Settings; +import li.cil.oc.api.Driver; +import li.cil.oc.api.driver.Item; +import li.cil.oc.api.driver.item.Memory; +import li.cil.oc.api.machine.Architecture; +import li.cil.oc.api.machine.ExecutionResult; +import li.cil.oc.api.machine.Machine; +import li.cil.oc.api.machine.Signal; +import li.cil.oc.common.SaveHandler; + @Architecture.Name("AVR 32Bit Clone") @Architecture.NoMemoryRequirements public class AvrArchitecture implements Architecture { diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java index 792b09745e..6da5055e08 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java @@ -7,12 +7,12 @@ import net.minecraft.client.renderer.texture.IIconRegister; import |