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

3746 commits

This branch
This branch
All branches
Author SHA1 Message Date
Krapht
054c8ed792 Organize imports 2012-06-09 13:41:28 +02:00
SirSengir
e1de3ecd1a Moved resources to seperate directory. 
Fixed a NPE in assembly table on SSP.
 2012-06-08 11:49:14 +02:00
SirSengir
c420b80716 Fixed incorrect inheritance. 2012-06-08 10:59:48 +02:00
Kyprus
e78fcf297c Code cleanup attempt #2 2012-06-07 20:17:08 -04:00
SirSengir
76ea5f4b91 Added mcmod.info for FML. 
Small refactoring.
 2012-06-08 00:58:25 +02:00
Kyprus
59ee83677b Fixing conflict resolutions derps. 2012-06-07 18:54:28 -04:00
Kyprus
e984ac27a0 Work on the laser in SMP. 2012-06-07 18:51:16 -04:00
Kyprus
1c2c729c36 Fix for multiple quarry arms. 2012-06-07 18:26:16 -04:00
Kyprus
65895a1cfc More entity refactoring 2012-06-07 18:24:37 -04:00
SirSengir
b9959ecd53 Merge pull request #49 from pahimar/master 
MCP mapping update
 2012-06-07 14:49:47 -07:00
pahimar
ba9e457039 Updated MCP mapping 2012-06-07 16:24:52 -04:00
Krapht
f4409810d6 Hopper: 
Now pushes topleft stack instead of bottom one
Does not manipulate client inventory in SMP
Code cleanup
Closes #47
 2012-06-06 13:17:33 +02:00
Krapht
8eda6c45d8 Merge pull request #48 from Landrash/master 
Added translation for new gui items. Corrected grammar and spelling.
 2012-06-05 07:58:37 -07:00
Landrash
16cd3a7942 Added translation for new gui items. Corrected gramar and spelling. 2012-06-05 16:36:10 +02:00
Landrash
707cd3eb9f Updated translation and corrected gramatic errors. 2012-06-05 16:27:40 +02:00
SirSengir
d474612978 Code cleanup. 2012-06-04 22:48:18 +02:00
SirSengir
15d239a6a9 Hopper now drops inventory contents when broken. Closes #46 2012-06-04 22:45:16 +02:00
SirSengir
90f3466960 Fixed issues when picking up engines of different types. Closes #42 2012-06-04 22:30:23 +02:00
SirSengir
175703ddf2 Added Forestry-style energy ledger to engines. 2012-06-03 13:41:41 +02:00
SirSengir
6f8d594197 Pipe wires are synched on first connect of client. Wire signal synching is still missing. 2012-06-03 11:48:15 +02:00
SirSengir
8d75f63255 Fixed non-displaying liquid textures. 2012-06-03 10:55:46 +02:00
SirSengir
714a6a157f Merge branch 'fmltexturesupport' of https://github.com/cpw/BuildCraft into cpw-fmltexturesupport 
Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java
 2012-06-01 20:53:16 +02:00
SirSengir
05dfd57a21 Merge pull request #37 from CovertJaguar/patch-1 
Fixed black laser beams.
 2012-06-01 02:43:28 -07:00
CovertJaguar
294a3a5008 Should fix black laser beams. 2012-05-31 04:56:34 -07:00
Krapht
5940f6026d Pickup items after digging 
Increase pickup range
 2012-05-31 00:40:28 +02:00
Kyprus
b3afe87210 Bumped the range on sending packets to 128. 2012-05-30 14:06:28 -04:00
Kyprus
5022848678 Fixed quarry NPE and lasers not showing 
For #20
 2012-05-30 10:42:37 -04:00
SirSengir
514039b92b Improved gate selection display client side. 2012-05-30 14:04:01 +02:00
SirSengir
9077e9dedf Improved diamond pipe client synch. 2012-05-30 12:27:30 +02:00
Kyprus
f4a018c286 Made the robot build again. 
Build still needs a rewrite.
 2012-05-30 01:56:39 -04:00
Kyprus
9dc2c768fa Starting refactor of the robot and laser entites. 
For issue #20
 2012-05-30 01:50:44 -04:00
Krapht
44973bc2b1 Fix gate sync to server 
Fix gate values to client
 2012-05-28 02:39:39 +02:00
Krapht
92f2ab1d1e Merge pull request #32 from Kyprus/master 
Revert accidental merge, this better work Kyp!
 2012-05-27 13:00:42 -07:00
Kyprus
73506ba153 Revert "Merge branch 'TransportSecure'" 
This reverts commit a6872c5053, reversing
changes made to ff20f682fc.
 2012-05-27 15:53:52 -04:00
SirSengir
999d26eb23 Fixed previous commit. 2012-05-27 11:29:37 +02:00
SirSengir
a6872c5053 Merge branch 'TransportSecure' 2012-05-27 11:20:17 +02:00
SirSengir
ff20f682fc Suppress pipe stripping client side. 2012-05-27 11:19:11 +02:00
psxlover
50a4fa1ea0 A exception that was already being caught. 2012-05-27 09:58:35 +02:00
psxlover
37cac720e6 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 09:56:32 +02:00
psxlover
6ccc3c9e36 Removed some compilation warnings. 2012-05-27 09:56:32 +02:00
psxlover
7836986f04 Fix a localization issue. 2012-05-27 09:56:31 +02:00
psxlover
82fd2f651b NPE in Refinery GUI 
https://github.com/SirSengir/BuildCraft/issues/10
 2012-05-27 09:56:31 +02:00
psxlover
5a307cd0fe Revert "Used getEntitiesWithinAABB instead of getting all the players of the world for sendToPlayers." 
This reverts commit 93cd7fe74e.
 2012-05-27 09:56:31 +02:00
Krapht
7e00bd6a7f Add NPE protection 2012-05-27 09:54:45 +02:00
SirSengir
117b1fa6da Merge branch 'master' into TransportSecure 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportSolids.java
 2012-05-27 09:54:08 +02:00
SirSengir
64b9fdd460 Fixed compile error. 2012-05-27 09:45:02 +02:00
SirSengir
cd9cd11134 Merge pull request #28 from psxlover/master 
Several bugfixes.
 2012-05-27 00:39:14 -07:00
psxlover
f445024282 A exception that was already being caught. 2012-05-27 01:56:33 +03:00
psxlover
eb44f8fab1 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 01:36:01 +03:00
psxlover
e5e1ec40ee Removed some compilation warnings. 2012-05-26 22:44:51 +03:00