Commit Graph
18 Commits
Author SHA1 Message Date
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady 273e89a3b2 Get gas API completely working with capabilities 2016-05-23 13:45:17 -04:00
Ben Spiers d51aa1bb44 Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-12 23:58:19 +01:00
aidancbrady 374cc57515 Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated) 2016-05-10 22:24:37 -04:00
Ben Spiers 628c5865ca Fix crashes with null capability tiles.
Also concerns about missing capabilities.
2016-05-07 13:38:02 +01:00
Ben Spiers 384cf174bb Get capabilities off the ground 2016-05-04 12:45:12 +01: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
Ben Spiers bebad0c15e Experimental new MCMultipart rewrite of transmitters.
Less changed code than expected! Nothing renders or works yet though.
2016-04-30 19:53:39 +01:00
Ben Spiers 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady 06dc2227f2 A few ejector fixes 2016-01-28 23:45:22 -07:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Ben Spiers d29d1580bb Fix some stuff I missed in the merge, and server-client communication. 2015-04-04 02:44:14 +01:00
Aidan C. Brady e4d624d8ab Fancy new eject algorithms, should fix issues with PRC 2015-03-30 19:27:54 -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
Aidan C. Brady 49c7b1062a Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again 2014-06-10 12:49:49 +02: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