aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces/metatileentity
diff options
context:
space:
mode:
authorMatt <mtthw8198@gmail.com>2021-06-01 14:18:25 -0700
committerMatt <mtthw8198@gmail.com>2021-06-01 14:18:25 -0700
commitf87217e9a044b0f017d4b821017f697ca6568f42 (patch)
treeaad0a14640e146837c950157750e3ad6cca88ea5 /src/main/java/gregtech/api/interfaces/metatileentity
parent08aa6a7f525eea881a00331bc75f055c3d275c3e (diff)
parent9555f77feccabf92d3bcc20c985c2060e2455600 (diff)
downloadGT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.tar.gz
GT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.tar.bz2
GT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.zip
Merge remote-tracking branch 'origin/experimental' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/metatileentity')
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java2
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
index 9306ef28f3..f67fb0f600 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
@@ -4,4 +4,4 @@ public interface IMachineCallback<Machinetype extends IMetaTileEntity> {
Machinetype getCallbackBase();
void setCallbackBase(Machinetype callback);
Class<Machinetype> getType();
-} \ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
index a7c1209d24..85237ac4f4 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
@@ -12,4 +12,4 @@ public interface IMetaTileEntityCable extends IMetaTileEntity {
default long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) {
return transferElectricity(aSide, aVoltage, aAmperage, new ArrayList<>(aAlreadyPassedSet));
}
-} \ No newline at end of file
+}