aidancbrady
a10c57fb92
Work on custom model handling
2016-05-18 14:42:45 -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
735106c25e
Begin work on MekanismGenerators
2016-05-12 15:07:54 -04: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
aidancbrady
a1100dd47a
More render work!
...
- Added BuildCraft impl to render Model3D
- Got Gas and Fluid icons working properly
- Fixed CTM crash
- Fixed Flamethrower flame rotation issue
- Fluid Tank now renders inner fluid
- Fix some texture errors
2016-05-10 19:37:00 -04:00
aidancbrady
ddfe83c495
Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues
2016-05-09 21:07:18 -04:00
aidancbrady
c6f3c162f9
More work
2016-05-09 19:59:16 -04:00
aidancbrady
eba5f7e356
Work on TileEntity stuff. Details below.
...
I've added the method "Coord4D.safeTileGet()" which is likely going to be necessary in a lot of cases where duplicate TEs could be created- for some reason World.getTileEntity() fails to return the saved TileEntity fairly often.
2016-05-09 18:36:40 -04:00
aidancbrady
fc7b185805
Attempt to fix tile entity persistence
2016-05-09 14:52:56 -04:00
aidancbrady
3b75d9ff1e
Loads of work on CTM, work on fixing multi blocks
2016-05-09 00:10:54 -04:00
Ben Spiers
628c5865ca
Fix crashes with null capability tiles.
...
Also concerns about missing capabilities.
2016-05-07 13:38:02 +01:00
aidancbrady
c29e4ab9bc
Work on rendering- need to figure out why flamethrower sound is getting cut off
2016-05-05 21:01:10 -04:00
aidancbrady
13893bd705
A good bit of work
...
- Fixed infuse sprites
- Fixed liquid sprites
- Fixed Plastic Fence block states
- got Plastic Fence to render in block form
2016-05-04 23:37:21 -04: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
aidancbrady
dc4c882827
Bump API version numbers
2016-05-02 23:02:37 -04:00
Ben Spiers
185ea3c4d8
Experiments with Capabilities.
2016-05-01 23:10:47 +01: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
2e2f4ce390
Merge branch 'development' into 1.8.9
2016-04-29 16:52:22 +01:00
aidancbrady
1ddb56c226
More unit fixes
2016-04-28 18:35:36 -04:00
Ben Spiers
5825c84fad
Merge branch 'development' into 1.8.9
2016-04-27 23:47:00 +01:00
aidancbrady
1325b779b0
Prefilled Gas Tanks option
2016-04-25 17:43:11 -04:00
Ben Spiers
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01:00
Ben Spiers
78c2afb5ea
Actually get it compiling again.
...
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
aidancbrady
2873c0c797
Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator
2016-04-23 17:09:01 -04:00
aidancbrady
5dcddaf25b
Fixed glass render, added new Thermal Evaporation Plant computer integration
2016-03-22 17:18:55 -04:00
aidancbrady
f904c8b80c
Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release
2016-03-21 16:53:29 -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
e53c00d2b8
Fixed reactors shutting off when unloaded
2016-03-17 20:11:38 -04:00
aidancbrady
650b725567
Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators
2016-03-17 14:23:53 -04:00
aidancbrady
a247a80d53
Work on Formulaic Assemblicator, got a lot more of the core logic done than I was expecting to
2016-03-06 17:53:16 -05:00
aidancbrady
d332ad49b7
More consolidated fluid container management- I've been meaning to get to this for a long time
2016-03-06 02:15:56 -05:00
aidancbrady
866c76bafe
Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes
2016-03-05 13:17:58 -05:00
aidancbrady
1071f2fb4d
Adjusted numbers, everything is now nice and balanced
2016-02-29 00:31:19 -05:00
aidancbrady
7c160cc264
Interface and rendering fixes
2016-02-28 18:11:50 -05:00
aidancbrady
87438dcc7f
Boiler work, added heat info tab, worked on polishing heat interactions among machines
2016-02-27 13:32:48 -05:00
aidancbrady
9d55f6cc8a
Lots of work on resistive heaters, still mostly unfinished
2016-02-26 19:51:37 -05:00
Ben Spiers
b08bca67d4
Merge branch 'v9' into 1.8.9
2016-02-20 22:19:34 +00:00
aidancbrady
c9f0ed0941
Fix forestry sapling integration
2016-02-20 11:33:45 -05:00
aidancbrady
84da514b54
Rename Solar Evaporation Plant to Thermal Evaporation Plant
2016-02-18 18:37:38 -05:00
Ben Spiers
7b4fefeb60
Fix some of the things that were broken, add more type-specs.
2016-02-08 22:46:06 +00:00
Ben Spiers
ac39b6fabe
Merge branch 'v9' into 1.8.9
2016-02-08 14:55:27 +00:00
aidancbrady
203890ca88
Redesigned Solar Evaporation Controller to dynamically update heat instead of the simple linear algorithm used before
...
- Plant height determines overall rate of temperature change, rate of processing
- Biomes determine base temperature of plants, meaning a desert could process small amounts of brine on its own
- Rate of heat decay exponentially increases as heat increases, meaning large amounts of heat are needed to greatly increase temperature
- System of heat management designed for integration with heat API in near future
2016-02-02 21:39:37 -05:00
Ben Spiers
0179ea1f38
Mostly rendering improvements
2016-02-01 23:42:30 +00:00
Ben Spiers
25d0b7441b
Merge branch 'v9' into 1.8.9
...
Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
2016-02-01 23:40:35 +00:00
Ben Spiers
c5987588b8
Make Coord4D work as a BlockPos better.
2016-01-30 21:50:22 +00:00
aidancbrady
7c52d03cb5
Remove some legacy config handling, make all turbine values configurable
2016-01-30 08:46:36 -07:00
Ben Spiers
62e7cc8f65
Merge branch 'v9' into 1.8.9
2016-01-30 00:47:54 +00:00
aidancbrady
88cfee2ab2
Changed Metallurgic Infuser infuse system to use icons for textures
2016-01-29 17:47:41 -07:00
aidancbrady
06dc2227f2
A few ejector fixes
2016-01-28 23:45:22 -07:00