Commit graph

1218 commits

Author SHA1 Message Date
Krapht
e84f6cf790 Removed debug output 2013-03-30 22:06:11 +01:00
Christian
99bae591d5 Revert experimental pipe flow changes 2013-03-29 22:59:04 -04:00
Christian
738d5ede52 Fix oil, fuel, quarry and pump 2013-03-29 22:55:53 -04:00
Christian
4a5d5b219d Fix filler GUI and world rendering 2013-03-29 21:45:07 -04:00
Christian
05c235da6f Fix lasers 2013-03-29 21:24:49 -04:00
Christian
5441e821ad Fix trigger/action rendering 2013-03-29 20:47:12 -04:00
Christian
e6633ae6ff Fix up engineiron to use the new tank persistence methods 2013-03-29 18:17:49 -04:00
Christian
b341914b84 Fix up for liquidstack immutability 2013-03-29 15:40:27 -04:00
Christian
53a8db85e8 Fix up the rendering of gui engines. Closes #708 2013-03-29 12:43:29 -04:00
Krapht
d4a396e94a Fixed the hit effects and delete the old fuel png 2013-03-28 23:12:36 +01:00
Krapht
c4820303c6 Fixed the fuel texture 2013-03-28 22:48:18 +01:00
Krapht
d9db8bb0f5 * Fixed the breaking texture, good work CJ =) 2013-03-28 22:22:18 +01:00
CovertJaguar
4545cf90e2 Fixed block particle effects
They now use the correct texture (in theory).
2013-03-28 14:06:55 -07:00
Krapht
dbc76521a2 Use the striped pipe as the breaked block texture, for now 2013-03-28 21:40:21 +01:00
Krapht
50030fd815 Merge branch 'patch-4' of git://github.com/TarzanBuzzyMan/BuildCraft into fixxy 2013-03-28 17:01:46 +01:00
Krapht
5bbf31f279 Updated to forge 616 2013-03-28 17:00:52 +01:00
Krapht
6d93b645e2 Fir merge error 2013-03-28 16:44:03 +01:00
Krapht
aecc8f0d3a Merge branch 'IPowerReceptorChange' into mc1.5
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
2013-03-28 16:41:17 +01:00
Christian
193558f71c Printline die! 2013-03-28 07:47:57 -04:00
Christian
28f93b9dcc Printline die! 2013-03-28 07:47:06 -04:00
Christian
04be016691 Merge branch 'master' into mc1.5
Conflicts:
	common/buildcraft/transport/EnergyPulser.java
2013-03-28 07:46:50 -04:00
Christian
eb8d6cace2 Fix some minor logic derps in the energy pulser. Much better behaviour now. 2013-03-28 07:45:49 -04:00
Flow86
a4e7e74d5e Merge pull request #666 from Flow86/patch-powerRequest
Fix bug in power distribution (Generic and Wooden Pipe)
2013-03-28 04:29:18 -07:00
Flow86
4a8f1654c5 Merge remote-tracking branch 'remotes/origin/patch-powerRequest' into patch-renderPipe
closes #666
2013-03-28 12:27:57 +01:00
Flow86
cf4ecc45fb fix power pipes rendering 2013-03-28 12:16:34 +01:00
Flow86
673ccb6b42 fix render refinery 2013-03-28 12:08:53 +01:00
Flow86
bff16e6c96 fix rendering of liquids in pipes 2013-03-28 12:00:51 +01:00
Flow86
e01ea820a0 null pointer check in rendertank 2013-03-28 11:58:56 +01:00
TarzanBuzzyMan
254c671cec Update BlockOilStill.java
Strip off unnecessary code after Krapht's Forge PR merge.
2013-03-28 23:19:19 +13:00
TarzanBuzzyMan
6642d4fac1 Update BlockOilFlowing.java
Strip off unnecessary code after Krapht's Forge PR merge.
2013-03-28 23:15:37 +13:00
Flow86
042f0a1ad8 Merge pull request #704 from Flow86/patch-renderTank
Patch render tank
2013-03-28 02:02:41 -07:00
Flow86
83e8e14028 Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-renderTank 2013-03-28 10:02:10 +01:00
Flow86
f355eec9a4 Merge pull request #684 from TarzanBuzzyMan/patch-3
Update oil to use 1.5 texturing
2013-03-28 02:00:55 -07:00
Flow86
4d92a9b918 fix RenderTank 2013-03-28 10:00:05 +01:00
Flow86
f9b6980993 fix commit by TarzanBuzzyMan 2013-03-28 09:56:12 +01:00
Flow86
25755d57bc Merge remote-tracking branch 'remotes/patch-oil/patch-3' into patch-renderTank 2013-03-28 09:53:48 +01:00
Krapht
22d15a4c91 Fixed bad parameter name in IPowerReceptor. Fixed call to powerRequest calling with getOpposite in PipeTransportPower 2013-03-28 09:30:26 +01:00
Krapht
35d8a2c6bf Merge branch 'mc1.5' into IPowerReceptorChange 2013-03-28 09:24:24 +01:00
Christian
263ca23171 Fix logic inversion derp 2013-03-27 23:31:24 -04:00
Christian
ca0c865f2a Merge branch 'master' into mc1.5 and fix bug
Conflicts:
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/transport/Pipe.java
2013-03-27 23:30:30 -04:00
Christian
276cacdef6 Add in a few tweaks to autarchic gates - stacks of items if 8 pulses are set, and a "single edge" trigger mode. 2013-03-27 23:15:12 -04:00
Krapht
4438947cab Made the IPowerReceptor direction aware 2013-03-27 21:49:30 +01:00
Krapht
5703c85549 Replace BCAction and BCTrigger arrays with IAction and ITrigger arrays. Good catch AartBluestoke 2013-03-27 17:17:18 +01:00
Krapht
bd91c3ad21 Mark Builder API as deprecated 2013-03-27 17:00:44 +01:00
TarzanBuzzyMan
15430f4277 Update BlockOilFlowing.java
Missed an @SideOnly
2013-03-28 00:01:15 +13:00
TarzanBuzzyMan
38072c8aa7 Update BlockOilStill.java
Missed an @SideOnly
2013-03-28 00:00:06 +13:00
TarzanBuzzyMan
6e07805fce Update BlockOilStill.java
I forgot something
2013-03-27 23:54:53 +13:00
TarzanBuzzyMan
9baae232e3 Update BlockOilStill.java
Fix quick bug that Flow86 pointed out.
2013-03-27 23:48:56 +13:00
Krapht
07a69b4e87 Redid some textures that was dark/nontrasparent 2013-03-26 23:54:45 +01:00
Krapht
84754e1e79 lowercased texture name fixes #700 2013-03-26 23:06:16 +01:00