Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1467 commits 1 branch 0 tags 19 MiB
Commit graph

1104 commits

Author SHA1 Message Date
CovertJaguar
dd6fc63de8 Some cosmetic fixes for the last commit 
Damn tabs!
 2013-05-15 04:30:31 -07:00
CovertJaguar
0d392a1b6e Major Backport of Button code 
I recently did a major overhaul of Railcraft's button code for some
upcoming features. Figured I backport it to Buildcraft as well.

Texture information was abstracted into an easily swapped object.
Multi-Buttons can now have different textures for each state.
Added tool tip support for all buttons (with mouse over delay!).
Added textures and states for a "Lock" Multi-Button.
Greatly reduced code duplication.
 2013-05-15 04:17:26 -07:00
CovertJaguar
8721cb9719 This is how you make Oil Burn 
@viliml seriously test your PRs, BlockFluid intercepts the fire methods

I also made Oil burn forever like Netherrack.
 2013-05-13 18:54:04 -07:00
Krapht
232494a662 I think buildcraft has enough explosions already. ref #850 2013-05-13 22:08:53 +02:00
viliml
0de81a36ea Make still oil flammable and prone to explode(like real oil) 2013-05-13 20:43:50 +02:00
viliml
8d98cba857 Make flowing oil flammable and prone to explode(like real oil) 2013-05-13 20:42:15 +02:00
target-san
a8c3d9400b Added NBT persistence for pipe wires and redstone broadcast. Allows logic circuits with memory 2013-05-13 09:18:32 +03:00
Player
5617b67ef4 Prevent client crash from invalid pipe items. 2013-05-12 10:22:35 +02:00
SirSengir
722a3837bf 3.5.2 build changes. Removed SidedInventoryAdapter.java to cut down on helper classes. 2013-05-12 08:19:28 +02:00
Player
eb836c3ad0 Actually only use the slots for the side we're extracting from... 2013-05-12 04:57:03 +02:00
CovertJaguar
d2711c7427 Merge pull request #841 from KingLemming/master 
Updated Liquid Pipe Connection Logic
 2013-05-11 19:45:38 -07:00
Player
cdc86c0591 Fix inventory size calculating being 1 too low 2013-05-12 03:58:39 +02:00
King Lemming
092e40fb8f Fixed Liquid Pipe Connections for updated Pipe Connection logic. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-05-11 14:34:05 -04:00
CovertJaguar
6e76d4bec5 Filler Flatten no longer stopped by flowers 
Closes #769
 2013-05-11 03:19:26 -07:00
SirSengir
fa38e293e5 Rewrote vanilla inventory handling to use dedicated classes. 2013-05-11 11:40:46 +02:00
SirSengir
02c3b19ea9 Removed unused SurroundingInventory.java. 2013-05-11 11:06:42 +02:00
SirSengir
15c16d433c Removed unused InventoryUtil.java. 2013-05-11 11:04:58 +02:00
SirSengir
afdaa18868 Minor cleanups to ISidedInventory handling. No special casing for vanilla furnace required anymore. 2013-05-11 11:03:38 +02:00
immibis
88f336c799 Call isStackValidForSlot when inserting. 2013-05-11 16:55:41 +12:00
immibis
cede00e162 Vanilla ISidedInventory support for wooden pipes. 2013-05-11 16:44:34 +12:00
Krapht
a40e7c5365 Merge branch 'BCPlug' 2013-05-09 16:25:41 +02:00
CovertJaguar
f578aa0e2c Possible fix for Power Pipe load issues 
Closes #829
Closes #717
 2013-05-09 05:11:42 -07:00
Krapht
cd08b69662 Added additional render component to plug, finally removed old code 2013-05-08 20:24:40 +02:00
Andrew Meehan
b1064b659f uodated tilehopper to return true rather than attempting to scan the inventory attached 2013-05-08 10:33:06 -04:00
Andrew Meehan
d559946562 implimented isStackValidForSlot to return true if valid to allow for automation inserst (mainly Applied Energistics) 
Signed-off-by: Andrew Meehan <andrew@meehan.me.uk>
 2013-05-08 10:18:29 -04:00
Krapht
a9636aa119 Make pipes not connect if either has a plug, fixed issue with pipes not recalculating its connections on plug placement 2013-05-07 21:32:54 +02:00
Krapht
fdd5648a05 Added add/remove of plugs, fixed plug render sync issue, fix renderer, prevent render of gate on plugged sides 2013-05-07 20:48:19 +02:00
Krapht
b39802f210 Added recipe for plug 2013-05-07 19:09:22 +02:00
Krapht
b1ed48da37 Added plug item and item renderer 2013-05-07 19:03:03 +02:00
Krapht
6a6ba168c7 Added initial rendering for plugs 2013-05-07 18:35:27 +02:00
Krapht
2324400ea0 Save/Load + netsync for plugs 2013-05-07 18:23:10 +02:00
viliml
25c5439637 Lower engine heat 10 times 
I don't think a temperature of 10000°C or 0°C doesn't make sense. This way it will at least always be under the melting point of iron and above the freezing point of water.
 2013-05-07 18:57:01 +03:00
Player
1bc52bc16f add equals to BlockIndex 2013-05-06 15:21:17 +02:00
Player
fddf865298 optimize TilePump.initializePumpFromPosition by using a HashSet instead of a TreeSet for markedBlocks 2013-05-06 14:47:10 +02:00
Flow86
6687d8baf8 add isPipeRegistered for mods to check if pipe-id already taken. 2013-05-06 14:10:48 +02:00
CovertJaguar
e1d88a7d8f Added config option to disable Oil Springs 
And made the code ID Resolver compatible.
 2013-05-05 06:41:29 -07:00
CovertJaguar
842e520b60 Pipes with missing info are now deleted 
Closes #782
 2013-05-04 20:25:04 -07:00
CovertJaguar
4ee70e100b Merge pull request #825 from viliml/patch-2 
Add LiquidMotionEvents to waterproof pipes
 2013-05-04 13:56:17 -07:00
SirSengir
8f15b6371c Reduced Forge requirement. Last one for 1.5.1 should be fine. 2013-05-04 19:34:26 +02:00
viliml
95323927fe Add LiquidMotionEvents to waterproof pipes 
Why would it exist if it was never to be used?
 2013-05-04 18:07:45 +03:00
CovertJaguar
f35d63ecb4 Fire is now a soft block. 2013-05-04 00:16:33 -07:00
CovertJaguar
4d601e976e More Oil improvements and tweaks 
Added a 50% bonus to well gen in biomes that spawn Lakes.

Added Taiga to biomes that spawn Oil Lakes (waves at Canada and
Siberia).
 2013-05-03 13:56:41 -07:00
SirSengir
c01fd677b6 Bumped required Forge version. 2013-05-03 16:24:32 +02:00
SirSengir
ab614d64a7 Updated mappings for Forge 7.8/MC 1.5.2. 2013-05-03 16:18:09 +02:00
CovertJaguar
234d17b700 Null check getTanks() 2013-05-02 19:18:19 -07:00
CovertJaguar
7b9994bd86 Minor bugfix for Oil Lakes 2013-05-02 15:00:30 -07:00
CovertJaguar
bd6024a53f More improvements to Oil Gen 
Oil Lakes can no longer only spawn in sand. Added IMC calls for Lakes
and excluded Biomes.
"oil-lake-biome" and "oil-gen-exclude", both take the BiomeID as an
argument.

Increased specular highlights on Oil texture, you shouldn't have to jump
in the pool to tell the difference between lighting glitches and oil
anymore.

Oil Lakes now have 50% chance of being 2 blocks deep. Improved gen to
prevent floating trees, etc.

Oil Wells should no longer gen in mod added trees.
 2013-05-02 04:19:33 -07:00
CovertJaguar
0b44d97359 Fixed a couple bugs from the Oil commit 2013-05-02 02:59:30 -07:00
CovertJaguar
52ffd07bb3 Some minor improvements to the Engine Renderer 
Note: it still needs to be rewritten to use a single texture sheet.
 2013-05-01 18:14:34 -07:00
CovertJaguar
d2e7279498 Reduced Oil Spring respawn chance 2013-05-01 18:01:32 -07:00
CovertJaguar
e980637f7e Minor Engine opt 2013-05-01 17:35:37 -07:00
CovertJaguar
4361db859c Fix toLowerCase() calls for Turkish 2013-05-01 17:30:39 -07:00
CovertJaguar
c2ddf66ec7 Fixed Wood Engine lockups 
Closes #784
 2013-05-01 14:26:42 -07:00
CovertJaguar
c61daa06a5 Added Oil Springs 
Spawns an infinite Oil Spring at bedrock under 25% of large Oil Wells.
This Spring slowly produced more oil over time.

More balance testing needed, but I need to fix that damn Redstone Engine
bug first.
 2013-05-01 13:31:18 -07:00
CovertJaguar
b185cf7954 Fixed Tank liquid rendering 2013-04-30 18:24:11 -07:00
SirSengir
bb5a9fcf31 Merge pull request #795 from davboecki/master 
Add Pipe Content ItemStack NBT sync.
 2013-04-30 08:30:38 -07:00
viliml
f1d4ed242a Fixes https://github.com/BuildCraft/BuildCraft/issues/753 
LOL what a derp...
 2013-04-30 12:05:58 +03:00
CovertJaguar
62f374e40d Fixed last PR and removed unneeded Textures 2013-04-29 12:11:25 -07:00
CovertJaguar
437a870ab0 Merge pull request #791 from viliml/master 
Added default textures for the refinery and hopper
 2013-04-29 12:03:13 -07:00
CovertJaguar
7766374c11 Reduced unneeded Engine textures. 2013-04-29 12:02:41 -07:00
Krapht
7bbfa6a20c Fixed gate rendering. Fixes #810 2013-04-29 18:13:40 +02:00
CovertJaguar
4c37a6c7fb Revert AutoWorkBench changes 
Please continue the rewrite, but on the "crafting" branch for the
moment.
 2013-04-28 10:45:40 -07:00
Krapht
c39ad7242e Merge pull request #801 from davboecki/patch_3 
Fix AutoCraftingTable not respecting the doRemove flag.
 2013-04-28 07:34:32 -07:00
davboecki
b97355aa9f Fix AutoCraftingTable not respecting the doRemove flag. 2013-04-28 15:31:59 +02:00
Krapht
12e2d072af Made arePipesConnected protected 2013-04-28 14:14:38 +02:00
Alex
9abd1d2ec9 Removed NBT check 
The NBT check was not needed as vanilla workbenches don't care about NBT
 2013-04-27 21:21:31 -03:00
Alex
d752d87b15 Some general fixes. 
Sorry, CovertJaguar, I still have some more fixes and maybe more later.

For now, these changes fix this:
AW works with items with NBT data
AW now works better with items that have a container.
Also some cleanups.

AW meaning auto workbench
 2013-04-27 21:04:13 -03:00
CovertJaguar
0fd8cd9f70 Merge pull request #793 from Need4Speed402/patch-1 
some fix
 2013-04-27 16:57:32 -07:00
CovertJaguar
6596bb06fe Modernized Refinery Renderer 
Also fixed tex bind issues, closes #792.

Additionally, I added a generic liquid display list renderer since there
really doesn't need to be one for each block.
 2013-04-27 16:51:53 -07:00
davboecki
0c88fbda6a Add PipeContent NBT sync. 2013-04-28 00:24:52 +02:00
Alex
f0120931be Update TileAutoWorkbench.java 2013-04-27 16:07:27 -03:00
Alex
ec3d44db6f Update TileAutoWorkbench.java 2013-04-27 15:29:55 -03:00
Alex
145f70c16f pre compute fix 
blah blah blah this is a good fix so merge it
 2013-04-27 15:21:39 -03:00
CovertJaguar
a0eab6d603 Merge pull request #786 from Need4Speed402/master 
Rewritten Auto workbenches - Crowd source testing time!
 2013-04-27 10:27:04 -07:00
viliml
e11dd74310 Ooopsy 
Forgot an import
 2013-04-27 13:28:25 +03:00
viliml
fd3d32be60 Made the hopper use the new default textures 
Hope it works...
 2013-04-27 13:26:53 +03:00
viliml
1924771c5d Made the refinery use the new default textures 
Hope it works...
 2013-04-27 13:22:41 +03:00
CovertJaguar
53314b2107 Added Small MultiButton 2013-04-26 18:47:36 -07:00
Alex
22f6d690af Update ContainerAutoWorkbench.java 2013-04-26 21:04:30 -03:00
Alex
903dd33568 Update TileAutoWorkbench.java 2013-04-26 21:03:53 -03:00
Alex
bda4de6024 Update BlockAutoWorkbench.java 2013-04-26 21:03:24 -03:00
Alex
0a032da93f Update Utils.java 2013-04-26 21:02:58 -03:00
CovertJaguar
8985ec9402 Added proper blending to liquid rendering. 2013-04-22 20:22:19 -07:00
CovertJaguar
fd51e6524c More Fluid updates from MC 2013-04-21 17:33:01 -07:00
CovertJaguar
a1da3627ea Update Flow code from MC (with names!) 
I don't see anything that can account for the lag though.
 2013-04-21 17:22:31 -07:00
CovertJaguar
2a46bf1954 Added RC's button templates 
Feel free to use/rewrite/delete as you see fit.
 2013-04-21 14:06:37 -07:00
SirSengir
1eb2bd12a7 Merge pull request #742 from Need4Speed402/patch-1 
TranslatorSimple changed to support compatibility.
 2013-04-21 12:29:55 -07:00
Krapht
e639b31f3b Updated the forge version to .662. Updated Core dependency to require forge .662 2013-04-21 16:20:12 +02:00
Krapht
ff110f6068 Fixed naming 2013-04-21 15:43:23 +02:00
viliml
86809bb32b Made engines use the new default icons 2013-04-21 13:45:22 +03:00
Sergey
0af1d07e39 Update TileMarker.java 
Fix NPE on destroying tilemarker.
 2013-04-21 17:46:57 +08:00
CovertJaguar
4c23a494aa Wrenches can now rotate many more blocks. 
Implemented new Forge Rotation API.
 2013-04-18 14:41:21 -07:00
Krapht
497ff6af0a Change WireMatrix to use BitSet to determine if wire is present. Saves 3 bytes per packet 2013-04-17 19:35:00 +02:00
Krapht
62a2242012 Change ConnectionMatrix to use a BitSet internally to represent the connections. Saves 25 bytes per packet 2013-04-17 19:29:32 +02:00
Krapht
f6d75da8da Added BitSet codec 2013-04-17 18:46:03 +02:00
Krapht
83dfaf02d3 Remove inheratance from ConnectionMatrix. Save 6 bytes per packet 2013-04-17 18:14:46 +02:00
CovertJaguar
f9354ed275 Add Item registration 2013-04-17 03:50:32 -07:00
CovertJaguar
c64809a300 Don't register our own blocks, ... 
...let FML do that.
 2013-04-17 03:38:14 -07:00
Krapht
df09099ca6 Merge branch 'PipeConnectionRefactor' 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-04-17 08:23:53 +02:00
CovertJaguar
97ce3ff98a Merge pull request #655 from kouteiheika/master 
Bulletproof the Box class against accidental world corruption and bugs.

-Don't really understand, but merged anyway.
 2013-04-16 23:10:13 -07:00
Krapht
5705eb7ed7 Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 2013-04-16 07:57:39 +02:00
Krapht
b528468f99 Make sure to include up to, and including, meta 15 for facade generation (black wool) 2013-04-16 00:34:21 +02:00
Flow86
26a90d96e4 fix transport connects 
remove general check on transport class
 2013-04-15 10:15:09 +02:00
Flow86
44ca72ae3b add ForgeDirection to logic too 2013-04-15 09:46:52 +02:00
Flow86
aad0e4f394 fix Pipe connection generation 2013-04-15 09:36:49 +02:00
Krapht
cb231cd5e6 Removed the config option to always connect pipes. Refactored pipe connections 2013-04-14 18:24:02 +02:00
CovertJaguar
5ce65d4b47 Missed one 2013-04-14 02:22:44 -07:00
CovertJaguar
c87e2eaa87 Fixed bad texture binds 
See previous commit.
 2013-04-14 02:20:04 -07:00
CovertJaguar
77a3f3ceaf Fixed bad texture bind 
Binding textures by directly accessing the render engine seems to cause random effects. One instance I encountered when using that method was texture binds would fail for other TESRs that used bindTextureByName().
 2013-04-14 02:14:28 -07:00
Alex
fc39665aff Changed to support compatibility. 
This change was made to buildcraft would work better when a IInventory returned false when calling func_102007_a function. Now continues to check other slots. (Maybe you're using func_102007_a to return true if you want items to only go into a specific slot and not out.)
 2013-04-13 16:31:43 -03:00
SirSengir
4b82788976 Patch up potential NPE in ExtractionHandler. Closes #741 2013-04-13 18:37:12 +02:00
SirSengir
a21dfb7b5e Fixed liquid icon check to actually catch that edge case. (h/t Player) 2013-04-12 21:50:11 +02:00
SirSengir
7511a1f767 Added handling for LiquidStacks which do not have an icon set. Closes #739 2013-04-12 20:17:21 +02:00
Krapht
b624b5dd9f Fixed Icon API for Actions/Triggers 2013-04-11 19:28:34 +02:00
Flow86
08f0216be7 Merge pull request #737 from dmillerw/master 
Simple change to make BlockUtils consider isAirBlock when creating an ItemStack for a block.
 2013-04-10 23:35:59 -07:00
Flow86
5f9666a8b4 Merge pull request #729 from AlgorithmX2/master 
Facade shouldPassSneakingClickToBlock
 2013-04-10 23:34:43 -07:00
Christian
e3a2546beb Fix rendertank. Also add support for vanilla sided inventories. 2013-04-10 23:35:51 -04:00
Christian
e80d50e767 Fix for MCP names update 
Fix liquid render breaking texture binds
 2013-04-10 22:11:35 -04:00
Dylan Miller
4e74b295eb Forgot a closing parenthesis 2013-04-09 23:43:36 -07:00
Dylan Miller
24185aabce Made BlockUtils obay isAirBlock when creating an ItemStack 2013-04-09 23:40:34 -07:00
CovertJaguar
027a7006ff Emerald Pipes should remember their state better 2013-04-08 16:29:42 -07:00
AlgorithmX2
3230bcac51 Minor patch to allow other mo blocks to remove facades the same was as BC Pipes. 2013-04-07 15:05:01 -05:00
Flow86
b64de23421 fix Pipe Renderer 
closes #723
 2013-04-05 13:57:44 +02:00
CovertJaguar
a420e7bcfb Moved Texture Bind outside the loop 2013-04-04 19:26:48 -07:00
Flow86
da25a18c98 Update ItemGate.java 
fix broken language
 2013-04-04 19:26:18 +03:00
Krapht
57073f71a0 Throw exception if an action/trigger does not return an IIconProvider 2013-04-03 20:09:42 +02:00
Krapht
d79c4326cf Fixed serverside reference to Icon 2013-04-03 18:24:18 +02:00
Flow86
5aed4d1261 fix Engine translation/name not working 2013-04-03 09:08:07 +02:00
Flow86
ac3db7f7bd fix loosing information on chunk save/load 2013-04-03 08:56:01 +02:00
Flow86
09581d100b dont use Math.round 
merges and closes #696
 2013-04-02 12:51:44 +02:00
Flow86
1ad6209d42 Players engine corrections to target a specific amount of energy in the engine before throttling 2013-04-02 09:17:17 +02:00
Krapht
8f40131c37 Import cleanup, added warning supressions 2013-04-01 16:21:12 +02:00
SirSengir
fa6393b95b Added NPE check to prevent a crash when certain config options are unused. 2013-04-01 10:55:51 +02:00
Krapht
cb8602439f Fix breaking fx for submod pipes 2013-04-01 01:31:33 +02:00
Krapht
2095731772 Clarified javadocs Closes #609 2013-03-31 19:34:05 +02:00
Krapht
8cb7ff17a0 Remove debug output 2013-03-31 19:23:08 +02:00
Krapht
8401fc600c Make idle TileLasers more cpu friendly. Closes #617 
*Will only search for work every 5s (up from 0.5s)
*Will bleed 0.1MJ / tick while searching, so unless it gets
additional power it will eventually fully stop searching
 2013-03-31 19:18:44 +02:00
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
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
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
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
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
005d0bc4e1 Fix marker's rendering 2013-03-25 17:56:14 +01:00
Krapht
86d69f4078 Extracted method dropFacadeItem to avoid code duplication 2013-03-23 23:09:10 +01:00
Krapht
ada2bad7b0 Merge branch 'patch-676' of git://github.com/Flow86/BuildCraft into Flow86-patch-676 2013-03-23 22:35:26 +01:00
Krapht
e7d18f8d82 Merge branch 'mc1.5' of git://github.com/Techjar/BuildCraft into Techjar-mc1.5 2013-03-23 22:32:44 +01:00
CovertJaguar
05f8b556c4 More API fixes 2013-03-23 11:34:10 -07:00
CovertJaguar
a5d5d1a436 Fixed blueprint softblock error 2013-03-23 11:00:31 -07:00
Krapht
e35e0f2240 A custom BC built from source at an arbitrary time is versionless. Versions are decided on release. 2013-03-23 18:06:10 +01:00
CovertJaguar
e9c0d29032 More API Pruning 2013-03-23 02:31:14 -07:00
CovertJaguar
da3aa8374b Mass Cleaning & Updating 2013-03-23 02:21:06 -07:00
CovertJaguar
6cfabf56af Merged Trigger APIs 2013-03-23 02:16:17 -07:00
Krapht
7260d9445d Organizing imports 2013-03-23 09:40:22 +01:00
Krapht
b0fb4b3d8f Merge branch 'mc1.5' of github.com:BuildCraft/BuildCraft into mc1.5 2013-03-22 23:01:00 +01:00
Krapht
d888cb7b8d Fixed tank rendering in inventory 
partially fixed the BlockMarker
fixed the template item icons
fixed the oil bucket icon
Added texture for pipeWaterproofing and moved it to the BC tab
 2013-03-22 23:00:02 +01:00
Krapht
dd0122d622 Fixed the derp reverse of lit/dark gate textures 2013-03-22 22:04:00 +01:00
Krapht
eb6f7832b8 Update forge to 604 
Revert Sengir's build.xml
Fix Icon registration in Core to use the Item atlas
 2013-03-22 21:52:35 +01:00
Krapht
8192c8d792 Update names for forge build 604 2013-03-22 20:36:01 +01:00
Vilim Lendvaj
43227c6b3e Update to MC1.5.1 
It's a 100% compiling, 100% working and 95% textured build for 1.5.1,
MCForge build .600
 2013-03-22 19:46:33 +01:00
TarzanBuzzyMan
7280fa7165 Updated for obfuscations 
The field 94425 that I duplicated is a private field, and the names that someone has put as the deobfuscation name of the real one is a pile of crap so I will leave it as that till I or someone else can come up with a better one.
 2013-03-22 19:45:10 +13:00
CovertJaguar
2e9dbaa0f7 Break soft blocks before filling 
Closes #693
 2013-03-21 23:26:52 -07:00
aznhe21
2e7368150e Fix mining wells not put two or more stacks in pipe 2013-03-22 04:06:01 +09:00
Krapht
c352bc53ad Fix ledger Icons 2013-03-21 00:24:41 +01:00