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

729 commits

This branch
This branch
All branches
Author SHA1 Message Date
SirSengir
428d119699 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 21:21:31 +02:00
SirSengir
3a571db502 Moved network.v2 to network. 2012-09-08 21:21:07 +02:00
SirSengir
589e19b010 Merge pull request #224 from taralx/master 
Check for nulls in stacks returned from extractItem.
 2012-09-08 10:18:47 -07:00
JP Sugarbroad
bacc554832 Check for nulls in stacks returned from extractItem. 2012-09-08 09:53:10 -07:00
SirSengir
6576f72cb4 Fixed issue with TransactorSided.java. 2012-09-08 17:58:53 +02:00
SirSengir
2df33ac081 Removed StackUtil.java. 2012-09-08 17:45:04 +02:00
SirSengir
1e40b70649 Removed StackUtil from TileAutoWorkbench.java. 2012-09-08 17:40:38 +02:00
SirSengir
d30717b271 Replaced StackUtil.addToRandomInventory. 2012-09-08 16:20:21 +02:00
SirSengir
5059cd9abe Fixed pipes replacing other blocks in certain instances. 2012-09-08 15:58:30 +02:00
SirSengir
5a6fcf03d2 First attempt at removing StackUtil. 2012-09-08 13:40:05 +02:00
SirSengir
9e7e30bcfc Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 09:49:09 +02:00
SirSengir
495ee0bd96 Fix for dupe bugs on chests. 2012-09-08 09:42:11 +02:00
SirSengir
1934d22c6b Merge pull request #222 from taralx/master 
Gold item pipes should accelerate if the gate is emitting redstone.
 2012-09-07 23:55:13 -07:00
SirSengir
b630f1d8d4 Merge pull request #219 from maximaximal/patch-1 
improved the german language file
 2012-09-07 23:49:13 -07:00
JP Sugarbroad
cf28f59ed8 Gold item pipes will accelerate if their gate emits redstone. 2012-09-07 17:16:23 -07:00
maximaximal
1cac374de8 improved the german language file 2012-09-07 21:41:25 +03:00
SirSengir
ff16f89921 Merge pull request #217 from taralx/master 
Consume power when pulling from ISpecialInventory.
 2012-09-06 01:20:23 -07:00
SirSengir
15712c4d0f Merge pull request #218 from taralx/redstone 
Properly update neighbors for redstone signal changes.
 2012-09-06 01:19:22 -07:00
JP Sugarbroad
0488ff552a Properly update neighbors for redstone signal changes. 2012-09-05 23:17:51 -07:00
JP Sugarbroad
667bad3b92 Consume energy when pulling from ISpecialInventory. Also pull multiple stacks if energy permits. 2012-09-05 22:06:44 -07:00
SirSengir
51b8e73f26 Fixed proxy naming derp. 2012-09-05 22:56:45 +02:00
SirSengir
8a6d844680 Trying to add a user agent for ant. 2012-09-05 22:44:31 +02:00
SirSengir
5a9e195938 Removed unneeded import. 2012-09-05 22:30:37 +02:00
SirSengir
be58eee547 Reorganizing namespaces. 2012-09-05 22:29:38 +02:00
SirSengir
9643f4d52d Fixed subblock adding. 2012-09-05 21:23:34 +02:00
SirSengir
c82220d562 Shuffled some stuff around in creative inventory. 2012-09-04 23:12:37 +02:00
SirSengir
e1c8d447cc Merge pull request #210 from AartBluestoke/patch-11 
Quary should not use energy when 0 movement would result
 2012-09-04 03:09:20 -07:00
Andrew Hill
12e4b94714 Quary should not use energy when 0 movement would result 
Position is stored in 1/32's so if the movement is less than that, it will take the energy, then not move at all. This means that energy less than about 3.2/tick will never move the quary arm.
 2012-09-04 19:31:52 +10:00
SirSengir
978296708e Merge pull request #209 from Techjar/patch-1 
Oil should only generate in the overworld.
 2012-09-04 00:39:33 -07:00
Techjar
95c0d1eacb Better fix for nether oil generation. 2012-09-03 18:50:46 -03:00
Techjar
98441500d9 Oil should only generate in the overworld. 2012-09-03 18:40:51 -03:00
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