CovertJaguar
5e5c3dba08
Added support for non-standard capacity liquid container filling.
2012-07-14 06:11:40 -07:00
SirSengir
69412830a7
Merge branch 'master' of github.com:SirSengir/BuildCraft
...
Conflicts:
common/net/minecraft/src/buildcraft/api/recipes/RefineryRecipe.java
2012-07-14 14:33:55 +02:00
SirSengir
639aceb5d9
Fixed refinery recipes not working. Closes #95 .
2012-07-14 14:32:12 +02:00
SirSengir
a9674e6c24
Fixed refinery recipes not working.
2012-07-14 09:18:04 +02:00
SirSengir
604fa62374
Merge branch 'master' of github.com:SirSengir/BuildCraft
2012-07-12 14:33:59 +02:00
SirSengir
7f3163636f
Refactored API for combustion engine fuels and refinery.
2012-07-12 14:33:22 +02:00
SirSengir
c632f79150
Cleaned up liquids/LiquidStack.java
2012-07-12 13:11:59 +02:00
SirSengir
486cc38229
Merge pull request #91 from AartBluestoke/master
...
fixes issue 66
2012-07-12 03:19:28 -07:00
SirSengir
3022e1e5f3
Merge pull request #90 from psxlover/Localization
...
Refactored Localization.java to support addon localizations.
2012-07-12 03:03:10 -07:00
AartBluestoke
89c69427db
fixes issue 66, by using a temporary PRNG until the next full packet update comes through
2012-07-12 10:26:51 +10:00
psxlover
2cdbf7494d
Refactored Localization.java to support addon localizations.
2012-07-12 03:19:33 +03:00
SirSengir
740cb92802
Merge pull request #88 from psxlover/NPEfixes
...
NPE fixes
2012-07-11 14:57:18 -07:00
psxlover
c3dc022880
Fixed an NPE when a power pipe tries to give power to a ghost pipe.
...
This has been bugging me a long time, but since the old svn is gone I don't know what change caused it (it's not happening in 3.1.5).
It may not be the best approach but it prevents mc from crashing.
2012-07-12 00:22:19 +03:00
psxlover
610be32388
Discovered more NPEs related to LiquidManager so I took a new approach.
2012-07-12 00:16:52 +03:00
psxlover
edf5e8eb32
Null pointer exception when starting a server.
2012-07-12 00:04:05 +03:00
SirSengir
e24e663fbd
Redirected old liquid api references.
2012-07-11 19:20:37 +02:00
SirSengir
d3d4473d82
Fixed last commit.
2012-07-11 19:15:45 +02:00
SirSengir
57760812bd
Merge pull request #86 from CovertJaguar/master
...
Added filling of generic liquid containers to the Tank
2012-07-11 10:13:09 -07:00
SirSengir
1098c2ef72
Moved item inventory into Engine object.
2012-07-11 19:09:17 +02:00
CovertJaguar
785c51660f
Added filling of generic containers to Tank
2012-07-11 03:37:24 -07:00
SirSengir
685310fd79
Merge pull request #84 from pwaller/mcp-mapping-fix
...
mcp mapping update: Update func_46057_a => getIconFromDamageForRenderPass
2012-07-10 10:58:52 -07:00
Peter Waller
8f2ca3362b
mcp mapping update: Update func_46057_a => getIconFromDamageForRenderPass
2012-07-10 18:56:57 +01:00
SirSengir
062032da50
Merge branch 'master' of github.com:SirSengir/BuildCraft
2012-07-10 19:36:25 +02:00
SirSengir
792f2bff5f
Started refactor of liquid handling.
2012-07-10 19:35:43 +02:00
Kyprus
163984bdc2
Updated the README
2012-07-10 14:13:12 -03:00
SirSengir
f1caf84953
Merge pull request #83 from CovertJaguar/master
...
Added a new API function for filling liquid containers
2012-07-10 10:04:04 -07:00
CovertJaguar
ace10b05f4
Changed fill code to safer BuildcraftAPI.fillLiquidContainer()
2012-07-10 03:07:56 -07:00
CovertJaguar
2f0f8d9081
Added Liquid fill function.
2012-07-10 03:05:30 -07:00
SirSengir
6956322fd8
Merge pull request #79 from mistaqur/master
...
Compatibility fix to pipes with custom connection logic
2012-07-09 06:56:41 -07:00
SirSengir
95b6579e6d
Merge pull request #82 from Chicken-Bones/master
...
BuildCraft Frame patches
2012-07-09 06:53:47 -07:00
Chicken Bones
9755eadfb0
Patches so that pumps and pipes can be moved by frames properly, other buildcraft tiles not tested
2012-07-09 23:41:27 +10:00
mistaqur
692d0ff6d5
Compatibility fix to pipes with custom connection logic (e.g. pipes from Additional Buildcraft Objects)
2012-07-07 07:04:20 +04:00
SirSengir
7fbe8623ac
Diamond pipes now handle metadata when updating. Removed IInventory from TileGenericPipe.
2012-07-06 14:53:15 +02:00
SirSengir
51303806e3
Merge pull request #78 from rhilenova/issue_68
...
Issue 68: Stripping a gate will not clear the pipe of any active actions
2012-07-06 02:47:11 -07:00
rhilenova
16e33933c0
Reset all gate parameters when gate is stripped from pipe. This includes triggers, trigger parameters, actions, redstone, and pipe wires.
2012-07-05 21:30:41 -04:00
Krapht
85316e16f3
Check that we have a quarry arm before trying to tell it what to do
2012-07-05 18:27:46 +02:00
Krapht
cadd088f0b
Fix NPE when worldObj is null while reading NBT
2012-07-05 17:36:41 +02:00
SirSengir
5458dde84f
Merge pull request #77 from Maeyanie/master
...
Config option: Fillers destroy blocks
2012-07-05 03:58:24 -07:00
SirSengir
ed65b94585
Merge pull request #74 from Flow86/master
...
Don't redownload files everytime
2012-07-05 03:54:52 -07:00
Maeyanie
7f642772ed
Add config option to support Fillers destroying blocks instead of breaking them.
...
Prevents Fillers from being (ab)used as cheap Quarries.
2012-07-04 21:47:52 -04:00
SirSengir
a24e3c25ef
Fixed MCP mapping server side.
2012-07-01 19:12:50 +02:00
FloSoft
0bdd55fff4
moved download dir outside of builddir,
...
only download files if changed
2012-07-01 19:10:24 +02:00
SirSengir
f79d75ed7d
Merge branch 'master' of github.com:SirSengir/BuildCraft
2012-07-01 16:42:16 +02:00
SirSengir
9e0d9c14c5
Revert "Invalidating a TE should not cause the pipe to drop"
...
This reverts commit 1448dcf2ad
2012-07-01 16:41:17 +02:00
Krapht
0f171dc6a7
Git was being a git
2012-07-01 16:41:14 +02:00
Krapht
0ae552395e
Invalidating a TE should not cause the pipe to drop
2012-07-01 16:36:16 +02:00
Krapht
1448dcf2ad
Invalidating a TE should not cause the pipe to drop
2012-07-01 16:34:08 +02:00
Krapht
1befa02ad5
Merge branch 'master' of github.com:SirSengir/BuildCraft
2012-07-01 15:11:22 +02:00
Kyprus
92e7fe2d24
Fixed quarry not being removed properly.
...
Fixes #71
2012-07-01 08:58:17 -04:00
SirSengir
7cc1b63559
Merge pull request #70 from Landrash/master
...
Updated translation.
2012-07-01 05:37:10 -07:00
