Ben Spiers
|
384cf174bb
|
Get capabilities off the ground
|
2016-05-04 12:45:12 +01:00 |
|
aidancbrady
|
0c41c26042
|
Fixed HDPE and Control Circuit textures, half-finished work on balloons
|
2016-05-02 23:27:27 -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 |
|
aidancbrady
|
0ddc8da53e
|
Remove Lead Dust clone
|
2016-05-02 23:00:49 -04:00 |
|
aidancbrady
|
f03acedcd9
|
Get some item resource textures working
|
2016-05-02 22:57:57 -04:00 |
|
Ben Spiers
|
117076fe3c
|
Fix up some things
Move stuff that's probably not coming back soon out of source tree
|
2016-05-02 22:09:16 +01:00 |
|
aidancbrady
|
c7e54f8d28
|
Minor rendering updates
|
2016-05-02 16:39:38 -04:00 |
|
aidancbrady
|
b44c6f374a
|
Separate vertical and horizontal textures for small transmitters
|
2016-05-02 01:25:42 -04:00 |
|
aidancbrady
|
cfff1d50c4
|
Fixed Balloon entity data watcher
|
2016-05-01 19:15:14 -04:00 |
|
Ben Spiers
|
85c67666ad
|
Merge branch 'development' into 1.8.9
|
2016-05-01 23:57:29 +01: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 |
|
aidancbrady
|
4720e8f7af
|
Fixed Energy Cube crafting
|
2016-04-30 14:15:09 -04:00 |
|
aidancbrady
|
fe99d25305
|
Add network layer to make security preferences persistent
|
2016-04-30 11:26:12 -04:00 |
|
aidancbrady
|
c4520a072b
|
Crash fixes
|
2016-04-30 01:24:14 -04:00 |
|
aidancbrady
|
d98c4c181e
|
Crash fix
|
2016-04-29 22:56:09 -04:00 |
|
aidancbrady
|
1038c606ef
|
Fixed Fuelwood Heater side interaction
|
2016-04-29 22:28:31 -04:00 |
|
Ben Spiers
|
2e2f4ce390
|
Merge branch 'development' into 1.8.9
|
2016-04-29 16:52:22 +01:00 |
|
Ben Spiers
|
fc7fa7492e
|
More models
|
2016-04-29 16:42:29 +01:00 |
|
Ben Spiers
|
8e3d08dfd3
|
Some rough model improvements (tiers not done)
|
2016-04-29 00:36:29 +01:00 |
|
aidancbrady
|
1ddb56c226
|
More unit fixes
|
2016-04-28 18:35:36 -04:00 |
|
aidancbrady
|
32c1708cd2
|
Add appropriate transmission priorities for side config interfaces, fixed temp units
|
2016-04-28 10:00:08 -04:00 |
|
aidancbrady
|
feb48db20e
|
Fixed Resistive Heater energy unit conversion
|
2016-04-28 00:50:51 -04:00 |
|
aidancbrady
|
f84e5293bf
|
Gas Generator fixes
|
2016-04-28 00:21:06 -04:00 |
|
aidancbrady
|
ba8e5e198b
|
Fixed resetting of gas data in Gas-Burning Generator
|
2016-04-27 23:37:01 -04:00 |
|
Ben Spiers
|
55df74e240
|
Improve handling of energy cube item model
Use custom mesh definition now, it makes more sense.
|
2016-04-28 00:31:06 +01:00 |
|
aidancbrady
|
16c7dc92af
|
More rendering fixes
|
2016-04-27 19:08:01 -04:00 |
|
aidancbrady
|
47fd07f5c3
|
Rendering fixes
|
2016-04-27 19:05:53 -04:00 |
|
Ben Spiers
|
5825c84fad
|
Merge branch 'development' into 1.8.9
|
2016-04-27 23:47:00 +01:00 |
|
Ben Spiers
|
79d7d8b024
|
Fix up some more models, register StateMappers using the right function at the right time.
|
2016-04-27 23:40:23 +01:00 |
|
aidancbrady
|
5aa8041049
|
Fixed WAILA interactions
|
2016-04-26 22:47:07 -04:00 |
|
Ben Spiers
|
7efa4bcdbb
|
Fixing things
|
2016-04-26 17:40:17 +01:00 |
|
aidancbrady
|
6b106909f5
|
Fixed Bin WAILA display
|
2016-04-25 23:08:06 -04:00 |
|
aidancbrady
|
973339fa9a
|
Fixed Fluid and Gas Tank WAILA displays
|
2016-04-25 23:06:25 -04:00 |
|
aidancbrady
|
c2aa94d633
|
Player-relative block hardness for security-configured machines
|
2016-04-25 23:02:50 -04:00 |
|
aidancbrady
|
42cb905d3c
|
Tiny cleanup
|
2016-04-25 18:10:35 -04:00 |
|
aidancbrady
|
1325b779b0
|
Prefilled Gas Tanks option
|
2016-04-25 17:43:11 -04:00 |
|
Aidan
|
541a802228
|
Merge pull request #3186 from Buildstarted/dev
Peripherals api includes invalid indexes for methods with string parameters
|
2016-04-25 14:27:58 -04:00 |
|
Ben Dornis
|
7a77c4f2c0
|
fixed method indexes for peripherals
|
2016-04-25 09:58:11 -07:00 |
|
Ben Spiers
|
8064beb0fc
|
Fix compile errors from merge
|
2016-04-25 17:47:54 +01: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
|
5b893a1a81
|
Fuelwood Heater textures
|
2016-04-23 20:26:01 -04:00 |
|
aidancbrady
|
f645ced8cf
|
Fixed orphaned TEs. I hope this never is an issue again
|
2016-04-23 19:35:34 -04:00 |
|
aidancbrady
|
112c20c521
|
Fixed falling through certain Generator-related blocks
|
2016-04-23 18:59:38 -04:00 |
|
aidancbrady
|
65be977161
|
Formulaic Assemblicators are now 1000 times more efficient, combined with the last commit. I'm proud
|
2016-04-23 18:51:55 -04:00 |
|
aidancbrady
|
8f96e51142
|
Reduced Formulaic Assemblicator CPU usage by a factor of 10
|
2016-04-23 17:44:14 -04: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
|
ec69b2675e
|
Formulaic Assemblicator fixes
|
2016-04-23 13:02:47 -04:00 |
|