Commit graph

498 commits

Author SHA1 Message Date
SirSengir
65ac840b0b Merge pull request #207 from AartBluestoke/patch-10
StackUtil.itemsAdded should be >0 when doAdd is false. Closes #160
2012-09-03 05:36:06 -07:00
Andrew Hill
7a3bbe8f14 StackUtil.itemsAdded should be >0 when doAdd is false
all current uses of tryAdding(doAdd:false) which access itemsAdded compare the result to 0.

NOTE: while this does fix the AutoCraftingTable to accept items, it exposes the infinite recursion bug where it recursivly tries to add 1 item, then recurses without changing the stack size. (i'll do a seperate PR for that bug)
2012-09-03 20:30:29 +10:00
SirSengir
3621d210bb Merge pull request #206 from taralx/master
Small fixes
2012-09-02 23:29:30 -07:00
JP Sugarbroad
304e776203 Small fixes 2012-09-02 20:33:10 -07:00
SirSengir
eac30bea26 Fixed broken version. 2012-09-02 20:01:35 +02:00
SirSengir
4c733205af Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-02 19:37:13 +02:00
SirSengir
ca8e6d6713 Removed obsolete .info files. 2012-09-02 19:36:44 +02:00
SirSengir
9d7bc305a8 Merge pull request #147 from Chicken-Bones/master
Old world tank compatibility.
2012-09-02 09:18:59 -07:00
SirSengir
a78d325cff Merge pull request #203 from tcooc/patch
Fix for markers + moved logic to server
2012-09-02 09:13:47 -07:00
SirSengir
e5a62dd1b5 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-01 15:16:30 +02:00
SirSengir
38b11a9221 Removed references to BuildCraftAPI.BUCKET_VOLUME. 2012-09-01 15:15:56 +02:00
tcooc
cb2cfb00ca fix for markers not receiving redstone 2012-08-31 14:48:22 -05:00
SirSengir
e5d1a950eb Merge pull request #200 from AartBluestoke/patch-7
refineries now check liquid AND volume
2012-08-31 07:10:59 -07:00
SirSengir
9ff6aa2f4e Merge pull request #199 from AartBluestoke/patch-5
Tanks should sync to the client (set hasUpdate)
2012-08-31 07:09:40 -07:00
Andrew Hill
e32eef5d1a fixed derp
should check the stack has enough for the recipe, not the reverse.
2012-08-31 23:56:27 +10:00
Andrew Hill
167d0d6426 refineries now check liquid AND volume
refineries which don't check volume end up with strongly negative liquid amounts, but never run out.
2012-08-31 23:42:03 +10:00
Andrew Hill
ade53fc283 Tanks should sync to the client (set hasUpdate)
Tanks do not set hasUpdate anywhere, and so never send the client any updates: 
client side tanks don't visually change.
client de-syncs cause buckets to behave wonky (server thinks the bucket you hold is full, client thinks the bucket you hold is empty, you right click an "empty" bucket, and you place the liquid instead.

this patch resolves the first, and mostly resolves the second. it is still possible to get a visually incorrect bucket if you right click a bucket on a client-side-empty,server-side-has-liquid tank. (ie, before a sync occurs)
2012-08-31 23:25:29 +10:00
SirSengir
ef44692f1f Merge pull request #194 from Tinytimrob/master
More minor fixes
2012-08-31 01:27:07 -07:00
SirSengir
7af23a7af3 Merge pull request #196 from CovertJaguar/patch-11
Updated Pipe TESR render dist check
2012-08-31 01:26:11 -07:00
CovertJaguar
0073b52075 Added override tag 2012-08-30 02:58:48 -07:00
CovertJaguar
820dd20a09 Removed render distance check 2012-08-30 02:16:54 -07:00
CovertJaguar
c014124a0e Added render distance hook 2012-08-30 02:15:50 -07:00
Tinytimrob
322f305c46 Adding blueprint library and pipe wires to creative inventory 2012-08-29 23:58:42 +00:00
Tinytimrob
f2a9fc5d12 Prevent gates with damage value 0 from being shown in creative inventory twice 2012-08-29 23:30:35 +00:00
Tinytimrob
6ba900d5e3 Added configuration properties for wires, gates and facade 2012-08-29 23:26:57 +00:00
SirSengir
9d286985f0 Merge pull request #192 from Tinytimrob/master
Minor bug fixes
2012-08-29 14:18:11 -07:00
Tinytimrob
9787df588e Fix pick block function returning incorrect item ID when used on pipes 2012-08-29 20:04:51 +00:00
Tinytimrob
bfff6e7a88 Adding some missing items to the creative inventory 2012-08-29 19:41:02 +00:00
Tinytimrob
101d626c47 Added configuration properties for redstoneChipset and pipeWaterproof 2012-08-29 18:48:08 +00:00
Tinytimrob
140d4b412c Fix BuildCraft|Transport in mcmod.info 2012-08-29 16:59:18 +00:00
SirSengir
9f3db1077f Merge pull request #188 from CovertJaguar/patch-7
Some API cleanup to help reduce coupling
2012-08-28 04:05:21 -07:00
CovertJaguar
111694b644 Removed BuildcraftAPI ref from LiquidData 2012-08-28 03:03:18 -07:00
CovertJaguar
3666f4095a update imports 2012-08-28 02:52:06 -07:00
CovertJaguar
85573e46cc Depreciated BUCKET_VOLUME + removed BP init 2012-08-28 02:51:26 -07:00
CovertJaguar
7929afd912 Moved blueprint init 2012-08-28 02:50:00 -07:00
CovertJaguar
cbc8dbb8b4 Added Bucket volume constant to Liquid Man 2012-08-28 02:46:57 -07:00
Christian
a57141bc21 Send packets for liquids and power. also assembly table but that might be wrong? 2012-08-27 22:36:00 -04:00
SirSengir
a4aec7a6c5 Merge pull request #186 from CovertJaguar/patch-6
Gauge render tweak
2012-08-27 14:26:17 -07:00
Christian
9bbf92b39a Fix entities on the server side 2012-08-27 14:48:14 -04:00
CovertJaguar
9ac167e7ba Gauge render tweak 2012-08-27 04:56:50 -07:00
SirSengir
7b93a877e4 Merge pull request #185 from SandroHc/master
Updated some texts to pt_PT translation
2012-08-27 04:21:36 -07:00
Sandro Amaral
01585ded0e Updated some texts to pt_PT translation
Can someone say if this is the correct format? (I think is ISO-8859-1)
2012-08-27 11:53:30 +01:00
Christian
8d05d476f6 Fix up @Instance: it should refer to the mod in a multimod package 2012-08-26 14:41:44 -04:00
SirSengir
2c401220c1 Underped dedicated server. 2012-08-26 20:35:57 +02:00
Krapht
ab119af770 Separate the static travelling item collection between client and server 2012-08-26 12:56:34 +02:00
Krapht
7faf685e42 Fix for renderer to take the filler blocks into account. 2012-08-26 12:55:59 +02:00
SirSengir
17d73a9fdf Removed WorldClient references. 2012-08-25 22:12:51 +02:00
SirSengir
057724f4ba Fixed Forge download in build.xml 2012-08-25 21:00:04 +02:00
SirSengir
05fe385507 Removed debug stacktrace in quarry arm. 2012-08-25 20:37:30 +02:00
SirSengir
f4c196a2da Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-08-25 20:31:06 +02:00