psxlover
6ebd570eb1
Removed some useless code
2012-09-14 22:47:45 +03:00
psxlover
b1bc60ed0b
Fixed PathMarkers.
...
It was using EntityLaser while a recent commit changed the renderer to work on EntityPowerLaser.
Also the EntityLaser wasn't syncing the texture (another partial fix for #263 )
Also both the client and the server threads were manipulating the available pathMarker list. Now only the server side tiles are added.
Finally synced the state of the pathMarkers (whether or not they are searching for a new marker to connect)
2012-09-14 22:32:04 +03:00
CovertJaguar
2b00da5446
Added bottles as a water container.
2012-09-14 10:17:12 -07:00
SirSengir
0ce95c3134
Removed incorrect optimization for landmarks and path markers.
2012-09-14 19:04:58 +02:00
SirSengir
92195e8613
Synch powerAverage on laser entities. Partial fix for #263
2012-09-14 18:24:20 +02:00
SirSengir
0fa5a9d38e
Merge pull request #262 from psxlover/Build.xml
...
Build.xml
2012-09-14 05:37:57 -07:00
psxlover
9c257bd434
Forgot to change the command in readme
2012-09-14 15:23:50 +03:00
psxlover
c4dc51895f
Refactored build.xml
2012-09-14 15:23:50 +03:00
psxlover
44c8314a9a
Updated the build xml to download the required jars for the "getMethod".
...
Also made it copy the localization files.
2012-09-14 15:23:49 +03:00
SirSengir
151b576b49
Cleaned up a bunch of unneeded imports. Clean up your stuff before doing PRs please!
2012-09-14 14:04:36 +02:00
SirSengir
2f2dbe65b9
Merge pull request #249 from krisavi/Buildstuff
...
Builders language file fix
2012-09-14 04:57:46 -07:00
SirSengir
ff8492ee93
Merge pull request #260 from AartBluestoke/master
...
builder places the actual block consumed, rather than what is in the template. Closes #5
2012-09-14 04:54:40 -07:00
Andrew Hill
fdb3e85346
place the actual block consumed, rather than what is in the template
...
in almost all cases there is no difference, but there have been reports
that mod items with inventories get the inventories duplicated. this
should fix that.
2012-09-14 19:44:15 +10:00
SirSengir
49adae70b2
Merge pull request #256 from AartBluestoke/newb
...
correctly save and restore hasPulsar()
2012-09-13 15:12:02 -07:00
Andrew Hill
2df8069c57
correctly save and restore hasPulsar()
...
tested by saving and restoring a std. aut. gate.
2012-09-14 07:37:57 +10:00
SirSengir
3049ed6376
Merge pull request #251 from Flow86/patch-ant
...
Patch ant
2012-09-13 09:06:39 -07:00
Jenkins
5b1a546415
fix path
2012-09-13 09:55:33 +02:00
Jenkins
e0a3f6d37b
build.xml
2012-09-13 09:53:30 +02:00
Kris Avi
92fb7e8afe
Translatable areas
...
Translatable Template table gui title, gates gui title, still and moving
oil (in NEI) (and added Oils to en_US.properties)
2012-09-13 10:49:26 +03:00
Kris Avi
b264f29f88
Builders language file fix
2012-09-13 06:32:20 +03:00
SirSengir
6b557f1d99
Merge pull request #246 from tcooc/network-builders
...
Fixes for architect and bpt library
2012-09-12 12:07:29 -07:00
tcooc
2d40f13d5b
Added ClassMapping for String[] and finished bpt library fixes
2012-09-12 12:03:09 -05:00
tcooc
9ae784309e
Architects create bpts properly now + some bpt library fixes
2012-09-12 01:09:11 -05:00
SirSengir
a00f6129fa
Added special case handling for the vanilla furnace to squash XP exploits.
2012-09-11 22:38:16 +02:00
SirSengir
20df5fe093
Fixed renderer for pipe items using a max of two render passes.
2012-09-11 17:49:40 +02:00
SirSengir
e93b7c8f65
Removed remaining localizations.
2012-09-11 14:13:59 +02:00
SirSengir
8ef096ec14
Merge branch 'master' of github.com:SirSengir/BuildCraft
...
Conflicts:
buildcraft_resources/lang/buildcraft/sv_SE.properties
2012-09-11 14:13:39 +02:00
SirSengir
48127a2b0e
Removed localizations after moving them to a seperate repository.
2012-09-11 14:10:38 +02:00
SirSengir
533fc8cd0e
Merge pull request #242 from Flow86/patch-240
...
#240 fix build.xml
2012-09-11 01:54:59 -07:00
SirSengir
55184e8625
Merge pull request #239 from tcooc/patch2
...
Minor fixes for blueprint library and builder
2012-09-11 01:47:28 -07:00
SirSengir
56431a40be
Merge pull request #241 from Cassiobsk8/master
...
Translated to pt_BR
2012-09-11 00:15:18 -07:00
Krapht
d8150ebe17
Merge pull request #243 from N00byEdge/patch-1
...
Update buildcraft_resources/lang/buildcraft/sv_SE.properties
2012-09-11 00:06:41 -07:00
N00byEdge
b3fafd6c1b
Update buildcraft_resources/lang/buildcraft/sv_SE.properties
...
Fixed common swedish grammar error.
2012-09-11 08:24:24 +03:00
Jenkins
be9da27991
fix build.xml
2012-09-11 06:18:35 +02:00
tcooc
2ce657e4aa
Added missing fields and imports
2012-09-10 21:29:04 -05:00
tcooc
a65b768f34
Synched Blueprint Library progress bars
2012-09-10 20:10:29 -05:00
tcooc
450ca9e59e
Added Builder to creative inventory
2012-09-10 20:06:37 -05:00
Cássio K. Ferreira
61ea54b518
pt_BR translate
...
added a brasilian portuguese translate
2012-09-10 22:00:37 -03:00
SirSengir
ebb08b8456
Merge pull request #238 from Raeon/master
...
Added Dutch translation
2012-09-10 08:37:30 -07:00
Nex Kunore
67c14e91e6
Translated to Dutch - nl_NL
...
I got bored so I decided to be helpfull. :-)
2012-09-10 13:06:56 +02:00
SirSengir
0c4f9bae9e
Merge pull request #236 from AartBluestoke/patch-1
...
fixed wrong variable in condition.
2012-09-09 23:28:38 -07:00
Andrew Hill
9d80b9e4fb
fixed wrong variable in condition.
2012-09-10 08:17:36 +10:00
SirSengir
047cb4eaed
Merge branch 'master' of github.com:SirSengir/BuildCraft
2012-09-09 18:59:34 +02:00
SirSengir
1131a8d661
Added AartBluestoke's PR for RoundRobin transactor. Closes #234
2012-09-09 18:59:05 +02:00
SirSengir
d6c917b5b7
Merge pull request #232 from Techjar/patch-2
...
I don't think pipe recipes should have to be in the middle row of the crafting grid.
2012-09-09 05:12:02 -07:00
Techjar
1bf15b06cd
I don't think pipe recipes should have to be in the middle row of the crafting grid.
2012-09-09 07:29:55 -03:00
SirSengir
30aef0704c
End tank rendering if contained liquid does not exist. Closes #227
2012-09-09 12:14:35 +02:00
SirSengir
585095b0c2
Fixed exception in conjunction with NEI integration server side. Closes #229
2012-09-09 12:10:33 +02:00
SirSengir
d24b26d960
Fixed chunk reset related to autarchic gates. Closes #231
2012-09-09 12:06:59 +02:00
SirSengir
a47461a306
Some fixing of assembly table lasers.
2012-09-09 11:54:17 +02:00