Commit graph

1611 commits

Author SHA1 Message Date
SirSengir
e1d4cf14a8 Merge pull request #57 from psxlover/PathMarkersOptimization
Path markers optimization
2012-06-14 13:20:49 -07:00
psxlover
6540aed3f9 Removed WorldIterator.java and WorldIteratorRadius.java since they are no longer used anywhere else.
Also small change and cleanup
2012-06-14 22:04:29 +03:00
psxlover
90905e38b3 Optimized Path Markers. Connecting should be instant and doesn't iterate all the blocks around the marker like before.
Now increasing the max range between the path markers wont increase the load of the cpu and the time to connect.
2012-06-14 21:53:40 +03:00
psxlover
422e1b048e Corrected a bug where the pathMarkers didn't save properly, that sometimes (depending on the order they were loaded) resulted in "lost" connections after a world load. 2012-06-14 19:31:41 +03:00
SirSengir
c72fbbfe41 Fix url in mod meta files. 2012-06-12 18:51:15 +02:00
SirSengir
416ab6022d Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-06-12 18:43:47 +02:00
SirSengir
f64c1aef5c Attempt to fix lighting issues in advanced gui slots.
Fixed mod info files.
2012-06-12 18:42:33 +02:00
Kyprus
cd39bcf4b1 Fixed a couple texture paths. 2012-06-11 13:22:42 -04:00
Kyprus
8eb78d0e29 Fixed laser texture and jumping TileLaser. 2012-06-11 10:19:42 -04:00
Kyprus
d9a34f0ab1 Merge branch 'EntityRefactor'
Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/core/RenderLaser.java
	common/net/minecraft/src/BuildCraftCore.java
	common/net/minecraft/src/buildcraft/builders/TileBuilder.java
	common/net/minecraft/src/buildcraft/builders/TilePathMarker.java
	common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java
	common/net/minecraft/src/buildcraft/core/EntityLaser.java
	common/net/minecraft/src/buildcraft/core/EntityRobot.java
	common/net/minecraft/src/buildcraft/factory/EntityMechanicalArm.java
	common/net/minecraft/src/buildcraft/factory/TileQuarry.java
	common/net/minecraft/src/buildcraft/silicon/TileLaser.java
2012-06-10 19:19:34 -04:00
Kyprus
41cfa93e76 Lasers showing in SMP. 2012-06-10 19:08:16 -04:00
Krapht
31682c4c7b Fix texture paths 2012-06-10 21:32:35 +02:00
Kyprus
b872485663 Removed a couple debug messages. 2012-06-10 15:16:04 -04:00
Krapht
3a6e54ca69 Attempt to make a better hopper texture. 2012-06-10 21:05:08 +02:00
Krapht
8d32860b3a Fix frame decay. Closes #23
Destroys TE when block is destroyed
2012-06-10 02:57:21 +02:00
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