diff options
author | Matt <mtthw8198@gmail.com> | 2021-06-01 14:18:25 -0700 |
---|---|---|
committer | Matt <mtthw8198@gmail.com> | 2021-06-01 14:18:25 -0700 |
commit | f87217e9a044b0f017d4b821017f697ca6568f42 (patch) | |
tree | aad0a14640e146837c950157750e3ad6cca88ea5 /src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java | |
parent | 08aa6a7f525eea881a00331bc75f055c3d275c3e (diff) | |
parent | 9555f77feccabf92d3bcc20c985c2060e2455600 (diff) | |
download | GT5-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/internal/IThaumcraftCompat.java')
-rw-r--r-- | src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java index c4f416c823..13a3aba523 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java +++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java @@ -53,4 +53,4 @@ public interface IThaumcraftCompat { Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput, int aInstability, List<TC_Aspects.TC_AspectStack> aAspects); Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages); -}
\ No newline at end of file +} |