Commit graph

4144 commits

Author SHA1 Message Date
psxlover
03752e43d9 Revert "Used getEntitiesWithinAABB instead of getting all the players of the world for sendToPlayers."
This reverts commit 93cd7fe74e.
2012-05-26 20:43:59 +03:00
Krapht
4d3851ca28 Add NPE protection 2012-05-26 17:49:26 +02:00
SirSengir
9d30299a91 Fixed tile assembly table on SMP. 2012-05-26 15:40:32 +02:00
SirSengir
1162025f98 Merge branch 'master' into TransportSecure
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
2012-05-26 15:32:12 +02:00
SirSengir
fac800c8d2 Fixed tile assembly table on SMP. 2012-05-26 15:25:42 +02:00
Krapht
1916435724 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-05-26 02:15:19 +02:00
Krapht
1ab3c3e2d5 Added recipe for the Hopper 2012-05-26 02:14:36 +02:00
Christian Weeks
81b90ed54d Fix flowing oil too.. 2012-05-25 12:26:07 -04:00
Christian Weeks
7518eb0212 Update for FML mod texture 2012-05-25 11:41:55 -04:00
SirSengir
052b304797 Merge pull request #11 from mistaqur/master
Fixed several localization issues.
2012-05-22 02:12:34 -07:00
mistaqur
08683fd7dd Fixed several localization issues. 2012-05-22 01:31:30 +04:00
Krapht
a15d61ffd4 Underp the forestry imports 2012-05-21 22:38:46 +02:00
SirSengir
9422a33f41 Update common/lang/buildcraft/sv_SE.properties 2012-05-21 10:37:39 +03:00
SirSengir
9897b2ae3d Merge pull request #8 from psxlover/Fixes
Improved sendToPlayers using getEntitiesWithinAABB
2012-05-21 00:36:12 -07:00
SirSengir
f825a5265b Merge pull request #9 from Landrash/master
Added Swedish translation
2012-05-21 00:33:17 -07:00
Landrash
50d6d57006 Swedish translation of buildcraft 2012-05-20 22:38:52 +02:00
psxlover
93cd7fe74e Used getEntitiesWithinAABB instead of getting all the players of the world for sendToPlayers. 2012-05-20 22:33:19 +03:00
SirSengir
3c17b73551 Merge pull request #6 from psxlover/Fixes
SendToPlayers only on specified world instead of all worlds.
2012-05-20 07:33:16 -07:00
SirSengir
a6c357cb23 Added secure wooden pipe. 2012-05-20 16:27:53 +02:00
SirSengir
e3ce7e9063 Merge branch 'master' into TransportSecure 2012-05-20 15:52:56 +02:00
SirSengir
cd6cd174cc Update to de_DE localization. 2012-05-20 15:51:37 +02:00
psxlover
0111cd7528 Forgot to remove an import 2012-05-20 14:37:52 +03:00
psxlover
6ea0d5979a Fixed weird bug where sendtoplayers would send to the players on all worlds instead of only the one where the block calling sendtoplayer is. 2012-05-20 14:34:23 +03:00
SirSengir
4404fc3b16 Updated localization files, added russian localization courtesy of mistaqur. 2012-05-19 23:04:52 +02:00
SirSengir
e0e0b3e55d Updated german translation. 2012-05-19 12:38:45 +02:00
SirSengir
760d6f316c Added localization support to guis. 2012-05-19 12:36:43 +02:00
SirSengir
198b6c0339 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-05-19 11:43:32 +02:00
SirSengir
d4681e4cef Localization support, de_DE localization. 2012-05-19 11:42:36 +02:00
Christian Weeks
3244773fea Tweak textureFx for fml support 2012-05-18 20:24:48 -04:00
Christian Weeks
1559f77695 Use FML functions and FML mod texture static for texture overrides 2012-05-18 20:18:32 -04:00
SirSengir
dcd076728e Merge pull request #4 from psxlover/Fixes
NPE fix and build.bat improvements.
2012-05-16 10:07:28 -07:00
psxlover
20e5a70575 Null pointer exception when selecting an item to build in the assembly table. 2012-05-16 00:37:08 +03:00
psxlover
648cbf7dda Fixed build.bat 2012-05-16 00:33:50 +03:00
SirSengir
bc1fd20417 Reordered transport inheritance to fix steel pipes. 2012-05-15 20:10:34 +02:00
SirSengir
47a4c58052 More secure logic. 2012-05-14 20:12:24 +02:00
SirSengir
2d1e11fc81 Initial iteration of steel pipe. 2012-05-14 19:07:16 +02:00
SirSengir
73e04b24b1 Pipes track the player that placed them now. 2012-05-14 18:21:23 +02:00
SirSengir
a3b727aa9e Merge pull request #2 from Kyprus/master
Fix for the quarry arm in SMP
2012-05-12 12:39:41 -07:00
Kyprus
169a8a4805 Fixed the quarry arm in SMP. 2012-05-12 15:25:46 -04:00
SirSengir
c72a7729d7 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-05-11 17:14:47 +02:00
SirSengir
ce61cb65dc close[t:1] Stripping a gate will reset triggers on pipe. 2012-05-11 17:09:12 +02:00
Krapht
7acf0d7f6b More git learning 2012-05-09 23:59:28 +02:00
Krapht
53411bc70c learning git 2012-05-09 23:56:13 +02:00
SirSengir
82607ee9d2 Initial commit to github. 2012-05-09 22:43:05 +02:00