Commit graph

729 commits

Author SHA1 Message Date
Christian
5fe98733e0 Fix assembly table smp derpiness, somewhat. Should close #348 2012-10-13 15:24:57 -04:00
Christian
752a5eb2bd Remove debug 2012-10-13 15:24:43 -04:00
Christian
6299c472bb Revert "Merge pull request #329 from Xhamolk/patch-2"
This reverts commit 83d2b51931, reversing
changes made to 2cd7857d07.

Conflicts:
	common/buildcraft/transport/Pipe.java
	common/buildcraft/transport/PipeTransportItems.java
2012-10-13 14:54:54 -04:00
Christian
e89d3525b4 Fix facades working in SMP: the items should now exist both client and dedi server side. closes #338 2012-10-13 13:41:44 -04:00
Christian
ad8b896ef7 Attempt to fix liquid pipe flows. Should close #336 2012-10-13 12:14:07 -04:00
Vany Serezhkin
30bbb8930b Update common/buildcraft/core/utils/Utils.java
Allow Utils.addToRandomInventory() to work with hopper
2012-10-13 19:11:09 +04:00
CovertJaguar
1e0e23fe49 Add some null checking to the pipe GUIs
Fixes #345
2012-10-12 17:36:08 -07:00
CovertJaguar
d351f6455e Fix NPE if setInvSlotContents() fails. 2012-10-12 17:18:14 -07:00
CovertJaguar
b33f2ef369 Merge pull request #347 from CovertJaguar/master
Major pipe routing and net sync rework
2012-10-12 16:15:51 -07:00
CovertJaguar
0c8ac25122 Major pipe routing and net sync rework 2012-10-12 16:05:25 -07:00
SirSengir
12147e8da0 Merge pull request #344 from taralx/patch-1
Allow pipes to sync data to the client.
2012-10-12 03:21:23 -07:00
JP Sugarbroad
fe8b1d4fa6 Allow pipes to sync data to the client. 2012-10-11 14:37:29 -07:00
CovertJaguar
7e06d2c2d7 Merge remote-tracking branch 'upstream/master' 2012-10-11 14:11:50 -07:00
CovertJaguar
89b5096d06 Merge pull request #327 from psxlover/master
Added facade collision
2012-10-11 14:10:31 -07:00
CovertJaguar
83d2b51931 Merge pull request #329 from Xhamolk/patch-2
Pipes connecting improperly (fix of my last PR)
2012-10-11 14:09:21 -07:00
CovertJaguar
2cd7857d07 Merge pull request #335 from Xhamolk/patch-3
Machines should no longer send items to Sandstone pipes
2012-10-11 14:08:51 -07:00
RicBr
59a575c453 Update common/buildcraft/transport/BlockGenericPipe.java
Added missing ;
2012-10-11 13:52:47 -07:00
CovertJaguar
6d76ebbce3 Added missing import 2012-10-11 13:52:46 -07:00
CovertJaguar
b57f4a8c9d Added missing import 2012-10-11 13:52:45 -07:00
CovertJaguar
b54f97caf5 Merge pull request #343 from RicBr/master
Added missing ; in BlockGenericPipe.java
2012-10-10 22:54:32 -07:00
RicBr
5b2c2c7fb7 Update common/buildcraft/transport/BlockGenericPipe.java
Added missing ;
2012-10-10 19:17:46 +02:00
CovertJaguar
cb65663589 Added missing import 2012-10-09 14:52:15 -07:00
CovertJaguar
e84a42162a Added missing import 2012-10-09 14:51:44 -07:00
CovertJaguar
26278298b7 Merge pull request #341 from CovertJaguar/master
Fixed RP2 wires connecting to normal pipes
2012-10-09 14:50:01 -07:00
CovertJaguar
a39924a5a4 Fixed RP2 wires connecting to normal pipes 2012-10-09 14:45:35 -07:00
CovertJaguar
b2ec6d6ae8 Fixes a crash, experienced while playing. 2012-10-07 14:54:41 -07:00
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