diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-02-08 22:15:43 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-02-08 22:15:43 +0100 |
| commit | 539c60bb8df31a972b023751a4710c3d949e2845 (patch) | |
| tree | f9d23730b5c36995fb0adb94bb29b52cdeff7101 /src/main/java | |
| parent | 044967421a6b2f4b01a09d4b80d7704db56e14be (diff) | |
| parent | da2529429f0745600a9e4afa2b7f358397271ae2 (diff) | |
| download | GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.tar.gz GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.tar.bz2 GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.zip | |
Merge remote-tracking branch 'Technus/master' into upstream
# Conflicts:
# dependencies.gradle
Diffstat (limited to 'src/main/java')
96 files changed, 879 insertions, 1867 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index c281304205..fe85fc08c5 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,8 +2,8 @@ package com.github.technus.tectech; import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; -import com.github.technus.tectech.loader.gui.CreativeTabTecTech; import com.github.technus.tectech.loader.gui.CreativeTabEM; +import com.github.technus.tectech.loader.gui.CreativeTabTecTech; import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler; import com.github.technus.tectech.mechanics.anomaly.CancerCommand; import com.github.technus.tectech.mechanics.anomaly.ChargeCommand; diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index c8eda64bea..90274c69e6 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -2,10 +2,10 @@ package com.github.technus.tectech.compatibility.dreamcraft; import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.util.TT_Utility; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TT_Transformer; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer; +import com.github.technus.tectech.util.TT_Utility; import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; 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 595d814fc5..ceadce9d6d 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java +++ b/< |