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

961 commits

This branch
This branch
All branches
Author SHA1 Message Date
CovertJaguar
573630b601 Fixed last commit cause the PR was lazy 2013-01-26 16:10:37 -08:00
CovertJaguar
79274a36ec Merge pull request #581 from bculkin2442/master 
Proper PR for issue #563 - dont make me fix it next time
 2013-01-26 16:08:06 -08:00
CovertJaguar
581c95e14d Registered Pipe items with FML 
This will cause the mismatched id warning to display once for existing
worlds. It should be ignored.
 2013-01-26 16:00:23 -08:00
pahimar
9ddd728711 BC Version check now threaded, will attempt the check 3 times, waiting 10s between failed attempts 2013-01-26 15:15:46 -05:00
Krapht
129a437d4e Added onBlockPlacedBy() wrapper to BlockGenericPipe and Pipe 2013-01-26 17:58:06 +01:00
SirSengir
6ab8a50b64 3.4.2 build. 2013-01-26 17:28:20 +01:00
SirSengir
5659043223 Sanity checked for itemstacks returned from extract. (NPE check) Fixes #601 2013-01-26 10:04:18 +01:00
Krapht
1b4f9fb431 Added a helper for merging stacks 2013-01-26 03:24:37 +01:00
SirSengir
35e3532f3d Created BC tab for creative inventory. (Yes, finally.) 2013-01-23 21:04:36 +01:00
SirSengir
5b68af8bee Merge pull request #590 from snyke7/patch-2 
Fix fuel burning mechanic in EngineIron
 2013-01-23 10:25:47 -08:00
SirSengir
efb932abf0 Update README.md 2013-01-23 15:07:03 +01:00
snyke7
1afcf370b5 Fix fuel burning mechanic in EngineIron 
Old implementation was not as intended I think. For example, lava as fuel should have outputted 20000 MJ, but actually outputted 20980 MJ.
This was because burnTime's value went 20,19,...2,1,0,20 - so that it had actually outputted 21 MJ for each amount of fuel.
Also, when the last amount of fuel was burned, burnTime would be 20 but fuel would be null, and so would currentFuel so that the last cycle was skipped.
So the actual output of some fuel was:
powerPerCycle * ((amount - 1) * (totalBurnTime/1000 + 1) + 1).
There probably are better ways to fix it but this is what seemed best to me.
 2013-01-21 14:27:38 +01:00
Christian
d7e06e07a3 Update rendering to use the vanilla renderitem- 3d items in pipes :) 
Fixed for recent MCP update in forge as well. Refreshed the TileEntityPickupFX code
from the vanilla source. Easier to diff against that source too now.
 2013-01-20 20:53:01 -05:00
CovertJaguar
03a14b6444 Merge pull request #584 from viliml/patch-6 
Fix typo
 2013-01-20 17:27:56 -08:00
CovertJaguar
304fc8cb97 Updated World Gen to the Event based system 
Hopefully I did this correctly.

@ScottKillen could you take a look, I'm sure you have more experiance
than I.
 2013-01-17 23:37:37 -08:00
pahimar
2936174e53 Temporarily neutered the world destruction potention of Builders until a proper fix is implemented 2013-01-17 12:37:05 -05:00
viliml
2377075577 Fix typo 2013-01-17 13:29:05 +01:00
SirSengir
8d6231d3e3 Merge pull request #578 from aznhe21/patch-pipes-useable 
Close the GUI when pipes destroyed
 2013-01-17 01:21:34 -08:00
CovertJaguar
8dfa54d930 Merge pull request #579 from psxlover/EngineGui 
Fix #577 energy and heat on combustion engines reseting.
 2013-01-16 18:09:05 -08:00
CovertJaguar
a830ab8d8a Merge pull request #580 from bculkin2442/patch-1 
Fix part of issue #552
 2013-01-16 18:08:15 -08:00
CovertJaguar
9c8953a830 Fixed Quarries breaking Bedrock 
Closes #519
 2013-01-16 18:04:09 -08:00
bculkin2442
71c84fc6b1 Part two of proper fix for issue #563 
Implement ILiquidTank getTank properly
 2013-01-16 19:49:54 -05:00
bculkin2442
96f1aed0a2 Part 1 of proper fix for issue #563 
Implement ILiquidTank getTank properly.
 2013-01-16 19:46:10 -05:00
bculkin2442
04f6dec925 Fix part of issue #552 
This fixes the first two bullet points of issue #552, as well as adding Forge/FML to the list of mod loading frameworks. I will leave the last bullet point up to someone who knows these things.
 2013-01-16 19:41:57 -05:00
psxlover
9504405b0f Fix energy and heat on combustion engines reseting after 65535 and 6553.5 respectively. It was caused because the messages were sending only one byte at a time while max heat (100000) needs 3 bytes to be sent (a short is 2 bytes so each message can send 2 bytes instead of one). 2013-01-17 00:48:45 +02:00
aznhe21
70adf53368 Close the GUI when pipes destroyed 2013-01-17 00:47:53 +09:00
SirSengir
10ef5530ea Removed unneeded check. 2013-01-16 16:27:06 +01:00
SirSengir
dc6fcac971 Added infinite water springs at bedrock level. 2013-01-16 16:18:21 +01:00
CovertJaguar
74c531ad2e Fixed headers in new files 
Oops.
 2013-01-14 17:19:07 -08:00
CovertJaguar
00adb7d1ba Added Emerald Pipe English localization tags 2013-01-14 17:11:36 -08:00
CovertJaguar
e63402b0fa Added Emerald Item/Liquid Pipes 
Also new texture for the Laser Crafting Table and fixed a bug with
Wooden Item Pipes not diplaying items that are being pumped.

Emerald Pipes are advanced versions of the Wooden Pipes. The Item Pipe
posseses a filter that pulls items from inventories in a blocking Round
Robin fashion. The Liquid Pipe has capacity and flow rate equal to a
golden pipe.

Note: ISpecial and ISelective Inventory interaction with the Emerald
Item Pipes is untested, there seems to be nothing decent to test with in
Buildcraft.
 2013-01-14 17:05:49 -08:00
Krapht
b4cb75d2d4 Merge pull request #575 from Dacktar13/patch-1 
to allow use of the pipe creation method
 2013-01-14 02:30:01 -08:00
SirSengir
e99dd51f12 Wooden pipe and redstone engine recipes now use the ore dictionary. 2013-01-13 19:52:48 +01:00
Dacktar13
add849a67d to allow use of the pipe creation method 2013-01-13 18:02:41 +00:00
SirSengir
644b173be2 Merge pull request #567 from davboecki/patch-itemload 
Fix item drop on world load.
 2013-01-11 05:35:14 -08:00
Krapht
2052cefd07 Merge pull request #568 from davboecki/patch-EntityPassiveItemStatic 
Remove static modifier from contributions inside EntityPassiveItem.
 2013-01-11 05:30:56 -08:00
davboecki
451e09afd8 Remove static modifier from contributions inside EntityPassiveItem. 2013-01-11 13:54:37 +01:00
davboecki
cbfbfb07b2 Added missing delay. 2013-01-11 13:35:30 +01:00
davboecki
3a0d50f0bb Fix Item drops on worldLoad. 2013-01-11 00:18:59 +01:00
SirSengir
bc2e7bacda Merge pull request #559 from KingLemming/master 
Pipe Connection fixes
 2013-01-10 03:03:37 -08:00
SirSengir
27e8d4c877 Merge pull request #557 from Shukaro/master 
Fixed NPE crash with Factorization Barrels
 2013-01-10 03:01:13 -08:00
SirSengir
d5420f8796 Merge pull request #560 from agaricusb/pipelog 
Log coordinates of invalid pipes
 2013-01-10 03:00:04 -08:00
Agaricus
d640951f2d Log coordinates of invalid pipes 
Based on Maeyanie's fix for the old BC2 Bukkit port:
7dac7f9c2a
Add more feedback to the 'invalid pipe' loading errors.
 2013-01-09 19:35:06 -08:00
King Lemming
b46d1c33cc Adjustments to Pipe Connection method to allow for proper sided checks (for correct liquid pipe support). Liquid pipes now query vs the correct side rather than UNKNOWN. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-01-09 19:12:56 -05:00
SirSengir
d333eafeeb Merge branch 'master' of github.com:SirSengir/BuildCraft 2013-01-09 22:47:23 +01:00
SirSengir
fd61daa54e Changes for 3.4.0 build. 2013-01-09 22:46:54 +01:00
Ross Swartz
148ee72092 Fixed crash with Factorization Barrels. 2013-01-09 12:38:22 -05:00
CovertJaguar
513388f6e3 Backs of Engines are now solid 2013-01-09 08:40:38 -08:00
CovertJaguar
f03c00fba3 Transactors now obey getInventoryStackLimit() 2013-01-09 08:17:43 -08:00
Christian
c95063ebd3 Fix wrench to pass sneak-clicks to blocks 2013-01-09 08:35:16 -05:00