diff options
| author | Maxim <maxim235@gmx.de> | 2023-02-16 10:14:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 10:14:49 +0100 |
| commit | 3b834d6cebae287cd9bbeddd4f157338da6e1ea5 (patch) | |
| tree | 84b429a27e1adf0674569160e40e4c916a1d93c3 /src/main/java/gregtech/api/metatileentity | |
| parent | e1ba22d7de9388dffb0ea7d99add79b95f94aa6a (diff) | |
| download | GT5-Unofficial-3b834d6cebae287cd9bbeddd4f157338da6e1ea5.tar.gz GT5-Unofficial-3b834d6cebae287cd9bbeddd4f157338da6e1ea5.tar.bz2 GT5-Unofficial-3b834d6cebae287cd9bbeddd4f157338da6e1ea5.zip | |
Fusion NEI support (#1742)
* Added optional special value to Power and getter for power into IMTE
* Added FusionPower to properly display available fusion recipes and OC
* spotlessApply (#1743)
Co-authored-by: GitHub GTNH Actions <>
* Moved compare flag to recipe map
* Missed a new constructor
* Added user request
* Addressed reviews
* Typo
* Update src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
Co-authored-by: miozune <miozune@gmail.com>
* Removed wrong bracket from git online commit
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 501e78ccec..62d6868286 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -751,7 +751,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B /** * Calcualtes overclocked ness using long integers - * + * * @param aEUt - recipe EUt * @param aDuration - recipe Duration */ @@ -1238,6 +1238,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B } } + @Override public Power getPower() { return mPower; } |