mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
This commit is contained in:
commit
84336ec4d1
571 files changed
+10295
-4773
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package mekanism.common.base;
|
||||
|
||||
import mekanism.common.tile.component.TileComponentConfig;
|
||||
import mekanism.common.tile.component.TileComponentEjector;
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
@@ -27,5 +28,5 @@ public interface ISideConfiguration
|
||||
* Gets this machine's ejector.
|
||||
* @return
|
||||
*/
|
||||
public IEjector getEjector();
|
||||
public TileComponentEjector getEjector();
|
||||
}
|
||||
Reference in new issue
Block a user