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
* development: Bump API version numbers Remove Lead Dust clone Separate vertical and horizontal textures for small transmitters Conflicts: src/main/java/mekanism/api/energy/package-info.java src/main/java/mekanism/api/gas/package-info.java src/main/java/mekanism/api/infuse/package-info.java src/main/java/mekanism/api/lasers/package-info.java src/main/java/mekanism/api/package-info.java src/main/java/mekanism/api/reactor/package-info.java src/main/java/mekanism/api/recipe/package-info.java src/main/java/mekanism/api/transmitters/package-info.java src/main/java/mekanism/api/util/package-info.java src/main/java/mekanism/common/item/ItemOtherDust.java src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalElite.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalUltimate.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalElite.png src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalUltimate.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png
This commit is contained in:
commit
076fc3c383
47 files changed
+38
-41
No files matched your search
@@ -6,8 +6,8 @@ import java.util.Set;
|
||||
import mekanism.api.util.BlockInfo;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class MekanismAPI
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user