Christian
c365be9e00
Merge branch 'chunkloading'
2012-09-25 23:14:33 -04:00
Christian
bb7da60425
Update to use proper forge chunkloading API
2012-09-25 23:14:21 -04:00
Christian
8da16b8956
Add an example chunkloading capability to the quarry. Also fix some
...
naming issues.
2012-09-25 23:14:21 -04:00
Christian
78dc1708d0
More MCP updates
2012-09-25 23:14:21 -04:00
Christian
61fd692f77
Update to new MCP
2012-09-25 23:13:36 -04:00
CovertJaguar
3b2be6b2c0
Merge pull request #296 from davboecki/master
...
I guess this is good.
2012-09-25 18:43:34 -07:00
davboecki
3518db7093
Fix ItemStack merging of ItemStacks with different NBTTagCompount information.
2012-09-20 00:41:16 +02:00
CovertJaguar
4c34f19116
Merge pull request #295 from psxlover/master
...
Missing import
2012-09-18 22:09:27 -07:00
psxlover
4e13b09177
Missing import from pr #283 .
2012-09-19 04:29:21 +03:00
CovertJaguar
625fb692b4
Merge pull request #291 from Flow86/patch-npe
...
fix NPE if pipe does not exist (null pipe)
2012-09-18 17:01:33 -07:00
CovertJaguar
c4633a4225
Merge pull request #293 from Xfel/master
...
Fixed pipe connections with tile entities whose blocks don't extend BlockContainer
2012-09-18 16:51:36 -07:00
CovertJaguar
f7d0b80093
Merge pull request #285 from Kubuxu/buckets
...
Creative buckets behavior and template and blueprint in creative inventory
2012-09-18 15:48:34 -07:00
CovertJaguar
4ef6ae19a1
Merge pull request #289 from psxlover/build.xml
...
Lets hope it works.
2012-09-18 15:47:32 -07:00
Xfel
09d522be58
Fixed Pipes not connecting to tile entities whose blocks don't extend BlockContainer
2012-09-18 21:38:56 +03:00
FloSoft
788b449ad3
fix NPE if pipe does not exist (null pipe)
2012-09-18 18:42:48 +02:00
psxlover
1472cdd558
One (hopefully) last bug on path markers
2012-09-18 14:58:56 +03:00
psxlover
b4e3277f8b
Proper fix for clearing the path markers list, and fix for connecting to path markers on a different world.
2012-09-18 14:25:52 +03:00
Kubuxu
123aba184c
Makes buckets behavior like in creative mode
2012-09-16 16:24:13 +03:00
Kubuxu
4cb363db13
makes buckets unused while player creative mode
2012-09-16 15:40:41 +03:00
Kubuxu
8d4b0eddf5
Makes buckets while player creative mode
2012-09-16 14:59:36 +03:00
Kubuxu
1f9e6f6303
Update common/buildcraft/builders/ItemBptBase.java
...
Shows templates and blueprints in creative inventory.
2012-09-16 11:17:43 +03:00
CovertJaguar
0479fab15d
Update common/buildcraft/builders/EventHandlerBuilders.java
...
Referencing WorldClient is bad
2012-09-15 19:28:26 -07:00
SirSengir
f1c67bc518
Merge pull request #278 from Kubuxu/patch-1
...
Update common/buildcraft/transport/ItemFacade.java to facades won't be consumed in creative mode
2012-09-15 14:09:55 -07:00
SirSengir
066e9b1cb8
Merge pull request #275 from tcooc/patch-3
...
Fix #267
2012-09-15 14:09:25 -07:00
SirSengir
960ebc925c
Removed version in mcmod.info. Only maintaining the version number in one place.
2012-09-15 23:07:44 +02:00
SirSengir
275b4842d3
Merge pull request #279 from psxlover/build.xml
...
Another build.xml pr...
2012-09-15 14:05:10 -07:00
psxlover
fe7c497ca8
Fixed two stupid mistakes in the build.xml:
...
1) used a mirror for the commons-codec download, and there was an update on it today, so the older version got removed from the mirror
2) used filterset when copying binary files which was corrupting them
Also while I was at it I updated the forge version.
2012-09-15 22:37:08 +03:00
Kubuxu
189e46221e
Update common/buildcraft/transport/ItemFacade.java
...
Facades won't be consumed in creative mode.
2012-09-15 21:49:45 +03:00
tcooc
863f0184fc
Fix #267
2012-09-15 13:20:14 -05:00
tcooc
fb86ea064a
Partial fox for #267
...
Switched to vanilla rendering
2012-09-15 13:06:32 -05:00
CovertJaguar
00e9a42027
Merge pull request #272 from Flow86/patch-272
...
Fix Bug with build.xml (again)
2012-09-15 08:04:04 -07:00
FloSoft
639931b1e2
Fix #272
2012-09-15 17:01:33 +02:00
CovertJaguar
be454bd0ab
Merge pull request #271 from Flow86/patch-271
...
Gates recognize Redstone Input again
2012-09-15 07:46:39 -07:00
FloSoft
52dd797b77
Fix #271
2012-09-15 16:22:22 +02:00
SirSengir
b902e8b82c
Merge pull request #268 from psxlover/Fixpathmarkers
...
Fix builder with paths
2012-09-14 14:36:21 -07:00
psxlover
ae0a265751
Fix builder with path.
...
No crashing now after setting the builder.
Also made the builder not crash if there is only one point in the path (probably it was crashing in a prior version too).
2012-09-15 00:09:15 +03:00
SirSengir
394175c6eb
Merge pull request #265 from psxlover/Fixpathmarkers
...
Fixed PathMarkers.
2012-09-14 13:27:28 -07:00
psxlover
362c95be2b
Fixed path showing of builder.
2012-09-14 23:26:39 +03:00
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
