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

853 commits

This branch
This branch
All branches
Author SHA1 Message Date
SirSengir
8dca5e6fda Merge pull request #320 from tcooc/itembpt-fix 
Blueprints sync in SMP
 2012-10-06 23:34:48 -07:00
CovertJaguar
7bd14cf8fa Merge pull request #333 from AartBluestoke/filler301patch_2 
fix filter shift-click
 2012-10-05 11:22:27 -07:00
Xhamolk
db09ffe65f Only route items when pipe is connected. 
Will no longer send items to a pipe that does not allow the connection.
 2012-10-05 10:01:50 -06:00
Xhamolk
569fde6e0c Merge pull request #1 from SirSengir/master 
rebased
 2012-10-05 08:39:21 -07:00
Andrew Hill
1f6003e722 fix filter shift-click 
The gui should not direct stacks moved by shift-click to the filter
area, just to the inventory area.
 2012-10-05 19:16:44 +10:00
CovertJaguar
a0fcd4ca5a Merge pull request #332 from AartBluestoke/filler301patch_2 
fix for #301
 2012-10-05 00:07:45 -07:00
Andrew Hill
7fcc3dcd54 fix for #301 
filler is now sided - top for pattern, all other sides for inventory.
 2012-10-05 17:01:23 +10:00
Xhamolk
342d6fe871 Routing and connection fixes 
2) Items pipes should no longer connect to ISidedInventory sides where getSizeInventorySide <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.
 2012-10-04 17:16:26 -06:00
Xhamolk
76adffe05c Pipes connecting improperly (fix of my last PR) 
1) Pipes now properly check if IPipeConnection allows the connection.

2) Items pipes should no longer connect to ISideInventory sides where getSizeInventory <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.

4) Fixes the bug my previous PR generated.
 2012-10-04 17:05:11 -06:00
psxlover
b77cf79b96 Added facade collision 2012-10-04 23:46:52 +03:00
Christian
5885f08fab IronEngines now accept Ice at a 1:1 ratio with water buckets, assuming your engine is hot 2012-10-02 00:09:26 -04:00
Christian
e8571a8e53 Fix up a bunch of "markBlockAsNeedsUpdate" to markBlockNeedsUpdate" and fixed engine to notify neighbours 
This fixes the engine being a bit derpy when being rotated
 2012-10-01 23:56:26 -04:00
Christian
890c4d45e9 Fix addToRandomInventory putting stuff from quarries etc into adjacent 
engines..
 2012-10-01 23:37:17 -04:00
Christian
ba1562b67f Revert broken pipe logic changes. No pipes are connecting anywhere now.. 
Revert "Update common/buildcraft/transport/PipeTransportItems.java"

This reverts commit 07cca7ad05.

Revert "Fixes pipes connecting improperly"

This reverts commit e7bd894e15.
 2012-10-01 23:24:16 -04:00
Christian
2e6c0ea475 Fix chunkloading for quarries. 2012-10-01 22:49:16 -04:00
SirSengir
6802a14545 Merge pull request #318 from psxlover/LaserFix 
Refactored lasers.
 2012-10-01 01:41:59 -07:00
tcooc
6635f23ec6 Blueprints sync in SMP 2012-09-30 22:28:51 -04:00
psxlover
6d5942bc8a Refactored lasers. 
Moved PowerLaser logic from EntityLaser.
 2012-09-30 22:42:09 +03:00
SirSengir
3658f908dd Merge pull request #302 from Xhamolk/patch-1 
Fixes pipes connecting improperly
 2012-09-30 01:15:16 -07:00
CovertJaguar
17a40802f8 Merge pull request #312 from amezick/master 
update build.xml forge version to 4.1.4.287
 2012-09-27 07:53:41 -07:00
Angus Mezick
4774f0ecdb update forge version number in build.xml files 2012-09-27 10:35:36 -04:00
CovertJaguar
1d80d0ea41 Merge pull request #309 from amezick/master 
mcp 7.2 forge 287 updates
 2012-09-26 12:32:43 -07:00
Angus Mezick
87ef38ee92 Renaming functions for latest MCP/forge 2012-09-26 15:11:58 -04:00
Christian
ded3f14ab9 It's 285, not 286 :( 2012-09-25 23:40:11 -04:00
Christian
425f131ded Depend on a known good version of Forge 2012-09-25 23:19:29 -04:00
Christian
c365be9e00 Merge branch 'chunkloading' 2012-09-25 23:14:33 -04:00
Christian
bb7da60425 Update to use proper forge chunkloading API 2012-09-25 23:14:21 -04:00
Christian
8da16b8956 Add an example chunkloading capability to the quarry. Also fix some 
naming issues.
 2012-09-25 23:14:21 -04:00
Christian
78dc1708d0 More MCP updates 2012-09-25 23:14:21 -04:00
Christian
61fd692f77 Update to new MCP 2012-09-25 23:13:36 -04:00
CovertJaguar
3b2be6b2c0 Merge pull request #296 from davboecki/master 
I guess this is good.
 2012-09-25 18:43:34 -07:00
Xhamolk
07cca7ad05 Update common/buildcraft/transport/PipeTransportItems.java 2012-09-22 12:23:42 -06:00
Xhamolk
e7bd894e15 Fixes pipes connecting improperly 
Pipes now check if IPipeConnection allows the connection.
 2012-09-22 12:15:48 -06:00
Xhamolk
abe642c778 Revert "Fixes pipes connecting improperly to IPipeConnection" 
This reverts commit 725d96e692.
 2012-09-22 11:54:42 -06:00
Xhamolk
725d96e692 Fixes pipes connecting improperly to IPipeConnection 
All pipes how check if adjacent IPipeConnection allow the connection.

Also, items pipes should no longer connect to ISideInventory sides where
getSizeInventorySide <= 0.
This allows third-party modders to prevent pipes connecting to their
machines withouth having to depend on BC's IPipeConnection.
 2012-09-22 11:53:53 -06:00
davboecki
3518db7093 Fix ItemStack merging of ItemStacks with different NBTTagCompount information. 2012-09-20 00:41:16 +02:00
CovertJaguar
4c34f19116 Merge pull request #295 from psxlover/master 
Missing import
 2012-09-18 22:09:27 -07:00
psxlover
4e13b09177 Missing import from pr #283. 2012-09-19 04:29:21 +03:00
CovertJaguar
625fb692b4 Merge pull request #291 from Flow86/patch-npe 
fix NPE if pipe does not exist (null pipe)
 2012-09-18 17:01:33 -07:00
CovertJaguar
c4633a4225 Merge pull request #293 from Xfel/master 
Fixed pipe connections with tile entities whose blocks don't extend BlockContainer
 2012-09-18 16:51:36 -07:00
CovertJaguar
f7d0b80093 Merge pull request #285 from Kubuxu/buckets 
Creative buckets behavior and template and blueprint in creative inventory
 2012-09-18 15:48:34 -07:00
CovertJaguar
4ef6ae19a1 Merge pull request #289 from psxlover/build.xml 
Lets hope it works.
 2012-09-18 15:47:32 -07:00
Xfel
09d522be58 Fixed Pipes not connecting to tile entities whose blocks don't extend BlockContainer 2012-09-18 21:38:56 +03:00
FloSoft
788b449ad3 fix NPE if pipe does not exist (null pipe) 2012-09-18 18:42:48 +02:00
psxlover
1472cdd558 One (hopefully) last bug on path markers 2012-09-18 14:58:56 +03:00
psxlover
b4e3277f8b Proper fix for clearing the path markers list, and fix for connecting to path markers on a different world. 2012-09-18 14:25:52 +03:00
Kubuxu
123aba184c Makes buckets behavior like in creative mode 2012-09-16 16:24:13 +03:00
Kubuxu
4cb363db13 makes buckets unused while player creative mode 2012-09-16 15:40:41 +03:00
Kubuxu
8d4b0eddf5 Makes buckets while player creative mode 2012-09-16 14:59:36 +03:00
Kubuxu
1f9e6f6303 Update common/buildcraft/builders/ItemBptBase.java 
Shows templates and blueprints in creative inventory.
 2012-09-16 11:17:43 +03:00