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

1218 commits

This branch
This branch
All branches
Author SHA1 Message Date
CovertJaguar
437a870ab0 Merge pull request #791 from viliml/master 
Added default textures for the refinery and hopper
 2013-04-29 12:03:13 -07:00
CovertJaguar
7766374c11 Reduced unneeded Engine textures. 2013-04-29 12:02:41 -07:00
Krapht
7bbfa6a20c Fixed gate rendering. Fixes #810 2013-04-29 18:13:40 +02:00
CovertJaguar
4c37a6c7fb Revert AutoWorkBench changes 
Please continue the rewrite, but on the "crafting" branch for the
moment.
 2013-04-28 10:45:40 -07:00
Krapht
c39ad7242e Merge pull request #801 from davboecki/patch_3 
Fix AutoCraftingTable not respecting the doRemove flag.
 2013-04-28 07:34:32 -07:00
davboecki
b97355aa9f Fix AutoCraftingTable not respecting the doRemove flag. 2013-04-28 15:31:59 +02:00
Krapht
12e2d072af Made arePipesConnected protected 2013-04-28 14:14:38 +02:00
CovertJaguar
3b33096b2b Merge pull request #797 from Need4Speed402/patch-2 
Removed NBT check
 2013-04-27 17:22:01 -07:00
Alex
9abd1d2ec9 Removed NBT check 
The NBT check was not needed as vanilla workbenches don't care about NBT
 2013-04-27 21:21:31 -03:00
CovertJaguar
2a99096f66 Merge pull request #796 from Need4Speed402/patch-2 
Some general fixes.
 2013-04-27 17:10:40 -07:00
Alex
d752d87b15 Some general fixes. 
Sorry, CovertJaguar, I still have some more fixes and maybe more later.

For now, these changes fix this:
AW works with items with NBT data
AW now works better with items that have a container.
Also some cleanups.

AW meaning auto workbench
 2013-04-27 21:04:13 -03:00
CovertJaguar
a54e4ec386 Renamed Hopper to Chute as discussed 2013-04-27 17:03:06 -07:00
CovertJaguar
0fd8cd9f70 Merge pull request #793 from Need4Speed402/patch-1 
some fix
 2013-04-27 16:57:32 -07:00
CovertJaguar
6596bb06fe Modernized Refinery Renderer 
Also fixed tex bind issues, closes #792.

Additionally, I added a generic liquid display list renderer since there
really doesn't need to be one for each block.
 2013-04-27 16:51:53 -07:00
CovertJaguar
019f40dfd3 Build.xml improvements 
Split reobfuscation out of compile and added run and test-run targets.
 2013-04-27 16:48:54 -07:00
Alex
f0120931be Update TileAutoWorkbench.java 2013-04-27 16:07:27 -03:00
Alex
ec3d44db6f Update TileAutoWorkbench.java 2013-04-27 15:29:55 -03:00
Alex
145f70c16f pre compute fix 
blah blah blah this is a good fix so merge it
 2013-04-27 15:21:39 -03:00
CovertJaguar
a0eab6d603 Merge pull request #786 from Need4Speed402/master 
Rewritten Auto workbenches - Crowd source testing time!
 2013-04-27 10:27:04 -07:00
viliml
e11dd74310 Ooopsy 
Forgot an import
 2013-04-27 13:28:25 +03:00
viliml
fd3d32be60 Made the hopper use the new default textures 
Hope it works...
 2013-04-27 13:26:53 +03:00
viliml
1924771c5d Made the refinery use the new default textures 
Hope it works...
 2013-04-27 13:22:41 +03:00
Vilim Lendvaj
cd77d401a8 Forgot one 2013-04-27 12:19:20 +02:00
Vilim Lendvaj
84a7076b3a Added textures for the refinery and hopper 2013-04-27 11:06:33 +02:00
CovertJaguar
53314b2107 Added Small MultiButton 2013-04-26 18:47:36 -07:00
Alex
22f6d690af Update ContainerAutoWorkbench.java 2013-04-26 21:04:30 -03:00
Alex
903dd33568 Update TileAutoWorkbench.java 2013-04-26 21:03:53 -03:00
Alex
bda4de6024 Update BlockAutoWorkbench.java 2013-04-26 21:03:24 -03:00
Alex
0a032da93f Update Utils.java 2013-04-26 21:02:58 -03:00
CovertJaguar
8985ec9402 Added proper blending to liquid rendering. 2013-04-22 20:22:19 -07:00
CovertJaguar
fd51e6524c More Fluid updates from MC 2013-04-21 17:33:01 -07:00
CovertJaguar
a1da3627ea Update Flow code from MC (with names!) 
I don't see anything that can account for the lag though.
 2013-04-21 17:22:31 -07:00
CovertJaguar
2a46bf1954 Added RC's button templates 
Feel free to use/rewrite/delete as you see fit.
 2013-04-21 14:06:37 -07:00
SirSengir
1eb2bd12a7 Merge pull request #742 from Need4Speed402/patch-1 
TranslatorSimple changed to support compatibility.
 2013-04-21 12:29:55 -07:00
Krapht
e639b31f3b Updated the forge version to .662. Updated Core dependency to require forge .662 2013-04-21 16:20:12 +02:00
Krapht
ff110f6068 Fixed naming 2013-04-21 15:43:23 +02:00
viliml
86809bb32b Made engines use the new default icons 2013-04-21 13:45:22 +03:00
Vilim Lendvaj
58a197b201 Added default textures for engines 2013-04-21 12:35:53 +02:00
Krapht
52177fd330 Merge pull request #767 from Prototik/master 
Fix for destroying a tilemarker.
 2013-04-21 02:50:44 -07:00
Sergey
0af1d07e39 Update TileMarker.java 
Fix NPE on destroying tilemarker.
 2013-04-21 17:46:57 +08:00
CovertJaguar
4c23a494aa Wrenches can now rotate many more blocks. 
Implemented new Forge Rotation API.
 2013-04-18 14:41:21 -07:00
Krapht
497ff6af0a Change WireMatrix to use BitSet to determine if wire is present. Saves 3 bytes per packet 2013-04-17 19:35:00 +02:00
Krapht
62a2242012 Change ConnectionMatrix to use a BitSet internally to represent the connections. Saves 25 bytes per packet 2013-04-17 19:29:32 +02:00
Krapht
f6d75da8da Added BitSet codec 2013-04-17 18:46:03 +02:00
Krapht
83dfaf02d3 Remove inheratance from ConnectionMatrix. Save 6 bytes per packet 2013-04-17 18:14:46 +02:00
CovertJaguar
f9354ed275 Add Item registration 2013-04-17 03:50:32 -07:00
CovertJaguar
c64809a300 Don't register our own blocks, ... 
...let FML do that.
 2013-04-17 03:38:14 -07:00
Krapht
df09099ca6 Merge branch 'PipeConnectionRefactor' 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-04-17 08:23:53 +02:00
CovertJaguar
97ce3ff98a Merge pull request #655 from kouteiheika/master 
Bulletproof the Box class against accidental world corruption and bugs.

-Don't really understand, but merged anyway.
 2013-04-16 23:10:13 -07:00
Krapht
5705eb7ed7 Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 2013-04-16 07:57:39 +02:00