Commit graph

236 commits

Author SHA1 Message Date
Krapht
5db9fb2e72 Merge branch 'master' into LiquidPipeRewrite
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
2012-07-20 18:48:32 +02:00
SirSengir
372d090a67 Fixed addition to generic inventories. 2012-07-20 16:02:04 +02:00
SirSengir
b8ed333b73 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-20 12:47:29 +02:00
Krapht
088a47bfb9 Merge pull request #103 from psxlover/master
Set the brightness before rendering a marker.
2012-07-20 00:52:36 -07:00
Krapht
b06adb30c6 Merge pull request #109 from CovertJaguar/patch-3
Some efficiency improvements to the pipe renderer.
2012-07-20 00:51:22 -07:00
SirSengir
22d7a716fe Replaced old ISpecialInventory in transport. 2012-07-20 09:19:46 +02:00
CovertJaguar
2e6f9acf60 Increased number of items for render from 5 to 10 2012-07-19 22:46:27 -07:00
CovertJaguar
5631c80eb6 Increased max number of items rendered from 3 to 5. 2012-07-19 22:20:46 -07:00
CovertJaguar
ec95590e0f Increased render distance. 2012-07-19 22:00:07 -07:00
CovertJaguar
e090b748b8 Reduced render distance. 2012-07-19 20:25:40 -07:00
CovertJaguar
1482cc41ac Limited number of items that can be rendered. 2012-07-19 20:09:15 -07:00
CovertJaguar
ecf58dc38f Various efficiency improvements to pipe rendering. 2012-07-19 19:33:49 -07:00
CovertJaguar
47eff20cb5 Added distance check to pipe render code limiting rendering to 32 blocks away. 2012-07-19 19:02:33 -07:00
Krapht
0b38427203 Started rewrite of liquid pipes for the new liquid API, will only connect to TEs that implement the new one.
Missing: center pipesection pulling fairly from multiple inputs, bounceback timeout when target tile haven't accepted liquid in a while.
Other: Netsync, NBT save, code cleanup, triggers,
2012-07-20 02:04:36 +02:00
SirSengir
4efd07332a Refactored everything outside of .transport to use ITankContainer and new ISpecialInventory. 2012-07-19 21:24:56 +02:00
SirSengir
be7bb5d31b More work on inventory interfaces. 2012-07-19 14:18:43 +02:00
SirSengir
d6f5adac9e Added new inventory interfaces. (Not functional yet!) 2012-07-18 23:03:50 +02:00
SirSengir
4d93993797 Fixed PneumaticPowerFramework.java 2012-07-18 17:42:54 +02:00
SirSengir
a617ef9ef9 Moved power framework API to new format. 2012-07-18 17:17:10 +02:00
SirSengir
4078a8367c Refactored LiquidTank to be an interface, added fill and drain functions. 2012-07-18 13:42:51 +02:00
SirSengir
6ac8ec1db6 Moved assembly table recipes to API. 2012-07-17 22:40:36 +02:00
SirSengir
8bf5f2b703 Added function to set liquid on LiquidTank.java 2012-07-17 21:28:56 +02:00
SirSengir
305947fe66 Converted refinery, tank and pump to use ITankContainer. 2012-07-17 18:21:11 +02:00
SirSengir
45a4c299dd Completing new API for liquids. 2012-07-17 17:49:05 +02:00
SirSengir
2f33943438 Tank liquids drop down into empty tanks below. 2012-07-15 23:00:35 +02:00
SirSengir
53cc613c9f Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-15 22:24:51 +02:00
SirSengir
45a4449c1c Fixed incorrect bucket registrations, liquid container handling. Closes #105 2012-07-15 22:23:40 +02:00
Kyprus
eb5fb522e1 Fixed assembly table lasers not showing up in SSP.
Closes #89
2012-07-15 14:55:06 -04:00
SirSengir
40a5536edf Merge pull request #104 from psxlover/AssemblyTableNPE
NPE on assembly table.
2012-07-15 10:56:31 -07:00
psxlover
1033d817ab Fixed an null pointer exception when clicking an empty slot in the recipes of the assembly table reported by iamamitten. 2012-07-15 20:52:52 +03:00
psxlover
44d166f382 Set the brightness before rendering a marker.
Should fix issue #73
2012-07-15 19:44:25 +03:00
SirSengir
8b8471fca2 Fixed infinite fuel production. 2012-07-14 18:04:30 +02:00
SirSengir
760dcf1d17 Cleaned up code. 2012-07-14 17:12:52 +02:00
SirSengir
8653702e84 Steam engines accept vanilla fuels again. 2012-07-14 17:06:00 +02:00
SirSengir
6566cae096 Merge pull request #99 from CovertJaguar/patch-2
Added putting liquid in the tank from non-standard capacity containers.
2012-07-14 07:54:31 -07:00
SirSengir
977988e5b2 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-14 16:48:14 +02:00
SirSengir
503e1242c5 Merge pull request #98 from CovertJaguar/patch-1
Added support for non-standard capacity liquid container filling.
2012-07-14 16:47:47 +02:00
CovertJaguar
74d4be1b11 Fixed liquid id. 2012-07-14 07:37:31 -07:00
CovertJaguar
18ba26eff2 Added ability to put liquid in the tank from non-standard capacity containers. 2012-07-14 07:33:54 -07:00
SirSengir
29b074acf5 Merge pull request #98 from CovertJaguar/patch-1
Added support for non-standard capacity liquid container filling.
2012-07-14 06:56:57 -07:00
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