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
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
aidancbrady
42ce42aee2
Moved debug reference to MekanismAPI, fixed RC recipe
2015-06-15 12:39:48 -04:00
Ben Spiers
fab95e8900
Re-organise imports.
...
I went for what seemed like a good level of organisation:
Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Ben Spiers
700cc76c35
Fix a different, unrelated OreDict issue.
2014-07-13 19:58:00 +01:00
tterrag1098
321fa4ed50
Some work on GUIs, mostly sfx
2014-05-06 02:57:39 -04:00
Ben Spiers
31938e8b68
Under 1300 errors left now, started on packet/network stuffs.
2014-04-20 21:15:44 +01:00
Ben Spiers
db7121454a
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
...
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00