Commit Graph
1837 Commits
Author SHA1 Message Date
Tom E 0c3b705e28 Fix wrong fence color - Fixes #3954
Missed a color meta state with the plastic fence.
2017-01-06 14:52:38 +01:00
aidancbrady 29e57462ee Merge branch '1.10' of https://github.com/aidancbrady/Mekanism into 1.10
# By Tom Elfring
# Via GitHub (2) and Tom Elfring (1)
* '1.10' of https://github.com/aidancbrady/Mekanism:
  Fix breaking of Glow Panels
  Fix for issue #3887
  Fix for issue 3954
2016-11-25 12:25:30 -05:00
aidancbrady 459cdc67e8 Crash fixes! 2016-11-25 12:25:26 -05:00
Aidan 86540e4891 Merge pull request #3967 from thommy101/issue3887
Fix breaking of cables and glow panel, fixes #3887
2016-11-25 12:03:48 -05:00
Tom Elfring aa4d5e90f1 Fix breaking of Glow Panels 2016-11-14 19:12:57 +01:00
Tom Elfring 12c3d17b2d Fix for issue #3887 2016-11-12 13:33:05 +01:00
Tom Elfring 578656cf97 Fix for issue 3954 2016-11-08 13:23:32 +01:00
aidancbrady 9f4c73ee94 Fixed homeLocation write 2016-11-07 20:37:27 -05:00
aidancbrady ccff5dcefe Merge branch 'master' into 1.10
* master:
  formatting & missing import for EOFException
  hopefully solving EOF & allocation problems
  More dynamic tank network optimization
2016-11-03 16:58:32 -04:00
Aidan a649846fcb Merge pull request #3788 from tossaponk/patch-2
More dynamic tank network optimization
2016-11-03 13:43:57 -04:00
mezz 92b5a2b115 Account for meta in the JEI ISubtypeInterpreter
I think an old JEI was using meta + the `ISubtypeInterpreter`, but it was not intended, and JEI does not do that now.
Right now, if you look up Mekanism stuff in JEI it shows all kinds of blocks instead of just the intended block.
This PR fixes the Mekanism `ISubtypeInterpreter` so that it differentiates machines and basic blocks again.
2016-10-28 20:07:17 -07:00
Aaron 15d1f32be2 formatting & missing import for EOFException 2016-10-21 17:13:14 +02:00
Aaron e7c4ac922f hopefully solving EOF & allocation problems 2016-10-21 17:08:06 +02:00
aidancbrady 65fa4967d6 Add a check to prevent render exception 2016-09-12 16:44:29 -04:00
aidancbrady b6d5a34121 Bump version to 9.2.1 2016-09-12 16:40:16 -04:00
aidancbrady dfd929747b Fixed tesla crash 2016-09-12 16:39:18 -04:00
aidancbrady df21655901 Fixed Dynamic Tank logic issue, changed transmitter redstone sensitivity to off by default 2016-09-12 16:35:30 -04:00
aidancbrady d8caab07f5 Fixed gas auto-output 2016-09-12 16:33:15 -04:00
tossaponk b717ab348f More dynamic tank network optimization
Currently, the dynamic tank will send update packet if stored fluid amount is changed even if the changed amount is very little and has no visual change(10000000->9999990) and wasting the server bandwidth. 
Instead of send change every time fluid amount changed. This edit will only send update packet when fluid level is noticeably changed saving a lot of bandwidth usage if the tank is actively getting filled and drained every tick.
2016-09-12 01:40:54 +07:00
aidancbrady 81e8107945 Get rid of scala reference 2016-09-07 07:57:00 -04:00
aidancbrady c314ae1594 Fixed bad transmitter model caching, fixed pressurized tubes cache storage, fixed Universal Cable double unload, fixed acceptor caching 2016-09-05 23:59:05 -04:00
aidancbrady b4db6397f5 Fixed transmitters unloading on server restart 2016-09-05 18:20:17 -04:00
aidancbrady 6a8dbb7a8c Fixed Configuration Cards, fixed thread instantiation 2016-09-05 16:48:12 -04:00
aidancbrady f92bcc0a6c Bump up Dynamic Tank max storage, fixed Factory container issue 2016-09-05 15:28:55 -04:00
aidancbrady 2d04343683 Fixed CTM crash, fixed Chunk Loader CPU usage, added new BioFuel recipes 2016-09-05 15:07:22 -04:00
aidancbrady f0013da56d Fixed a small crash 2016-08-30 15:16:47 -04:00
aidancbrady 1945ce44ee Cache Formulaic Assemblicator recipes, make Energy Cube and Gas Tank side configuration consistent 2016-08-27 18:08:21 -04:00
aidancbrady beeb369849 Fixed capability casting 2016-08-16 13:04:49 -04:00
aidancbrady 83e9b84f1a Fixed Dynamic Tank crash, fixed certain blocks not rendering 2016-08-16 12:46:40 -04:00
Aidan 20d40351cf Merge pull request #3644 from jmongeon/BeaconBase
Allow metal blocks to be used for beacons
2016-08-14 12:29:31 -04:00
feldim2425 8377633a3f Added Occlusion Test for Pipes and Wires 2016-08-13 21:10:21 +02:00
aidancbrady 9abd2baf89 Fixed render crash 2016-08-12 13:51:52 -04:00
aidancbrady cf60a6b026 Fixed cable crash 2016-08-12 13:43:06 -04:00
aidancbrady b52ab65d7a Consolidated fluid render library, better caching, fixed initial lag 2016-08-12 13:31:18 -04:00
jmongeon ab7df16e3a Allow metal blocks, refined glowstone blocks, and refined obsidian blocks to be used for beacons. 2016-08-11 15:52:06 -04:00
aidancbrady 7dfc9db949 Bump version to 9.2, add Minecraft version-based version handling 2016-08-11 12:15:16 -04:00
aidancbrady 8e1ee9a581 Chunk Loader Upgrades. They work with Digital Miners and automatically adjust to their mining radius. 2016-08-10 15:37:29 -04:00
aidancbrady 5a573b7d44 Creative Bins? Creative Bins. 2016-08-10 14:37:45 -04:00
aidancbrady 6de798356f Use JEI subtypes as NbtIgnoreList no longer really exists 2016-08-10 12:02:55 -04:00
aidancbrady a3eeda8e10 Fixed shapeless recipes, fixed dye colors 2016-08-10 11:44:07 -04:00
aidancbrady 46725948f2 Helper methods for DM chunks 2016-08-09 01:28:20 -04:00
aidancbrady 4958c40380 Fixed Tesla crash, added chunk loading system to allow for ease of future additions 2016-08-08 16:56:32 -04:00
aidancbrady d629fc03b7 Fixed Fluid Tank container issue 2016-08-08 13:15:15 -04:00
aidancbrady dd258521be Minor fix 2016-08-07 21:14:01 -04:00
aidancbrady ac4148c01b Creative Gas Tanks! 2016-08-07 20:40:28 -04:00
aidancbrady 3b07db3dc0 Fixed Mechanical Pipe crash, fixed Induction Cell issue, added Creative Fluid Tank and removed prefilled tanks 2016-08-07 19:58:45 -04:00
aidancbrady c44c23b5e9 CTM fixes! 2016-08-06 22:10:45 -04:00
aidancbrady a9177a0989 Bump version to 9.1.1 2016-08-05 21:28:23 -04:00
aidancbrady 770e127a75 Fixed IC2 crash 2016-08-05 20:45:40 -04:00
aidancbrady f00b35a017 Fixed Infusing Factory losing infuse storage, implement CTM model caching 2016-08-05 16:44:30 -04:00