aidancbrady
|
b355b80cf4
|
Fixed mod IDs, fixed generator recipes, added enabling/disabling of generators via config
|
2017-04-13 01:42:02 -04:00 |
|
aidancbrady
|
076fc3c383
|
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
|
2016-05-02 23:08:40 -04:00 |
|
aidancbrady
|
dc4c882827
|
Bump API version numbers
|
2016-05-02 23:02:37 -04:00 |
|
Ben Spiers
|
84336ec4d1
|
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
|
2016-03-18 04:24:19 +00:00 |
|
aidancbrady
|
87438dcc7f
|
Boiler work, added heat info tab, worked on polishing heat interactions among machines
|
2016-02-27 13:32:48 -05:00 |
|
Ben Spiers
|
9b8d9d92d6
|
Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
|
2016-01-14 19:22:48 +00:00 |
|
Ben Spiers
|
29c94f9dd8
|
Use package-info files and @API annotations.
|
2014-09-05 04:22:36 +01:00 |
|
Ben Spiers
|
c7a429177b
|
More work in the quest for greater recipe efficiency.
|
2014-09-05 04:20:12 +01:00 |
|