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
Krapht
eb78ff7efa
Fixed z-fighting issue on the inside of hollow facades and reduced the offset a bit to reduce long-range fighting
2012-07-15 02:24:10 +02:00
Krapht
f112d90363
Pipes now drop the Facades when destroyed
2012-07-15 02:09:52 +02:00
Krapht
9840c0e406
Moved facade adding to onItemUseFirst() in order to be able to add them to pipes with gates
2012-07-15 01:37:50 +02:00
Krapht
ebe9e3a020
Shift clicking a facade with facade equipped will now remove the facade from the pipe
2012-07-15 01:32:00 +02:00
Krapht
c8aa189aa8
First implementation of hollow facades + some generic rotation code. Known issue: wrong parts of textures are displaying on some hollow facade directions
2012-07-15 01:12:19 +02: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
90cc4999d4
Stopping gates from updating client side.
2012-07-14 11:25:17 +02:00
SirSengir
a9674e6c24
Fixed refinery recipes not working.
2012-07-14 09:18:04 +02:00
Krapht
f6e9377bc5
Do not render the structure support pipe if the pipe is connected in that direction, Added AssemblyTable recipes for all facades, Made using facades decrese the stacksize, Made replacing a facade pop off the previous one,
2012-07-14 00:40:16 +02:00
SirSengir
a0a542a669
Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor
2012-07-13 22:28:36 +02:00
SirSengir
7dbd03e34c
Merge branch 'master' into FacadesRefactor
2012-07-13 22:23:36 +02:00
Krapht
db1619c416
Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor
...
Conflicts:
buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
buildcraft_client/net/minecraft/src/mod_BuildCraftCore.java
buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
common/net/minecraft/src/BuildCraftTransport.java
common/net/minecraft/src/buildcraft/transport/PipeRenderState.java
common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
2012-07-13 22:05:38 +02:00
Krapht
1df6245237
Implemented facades.
...
Still to do:
Proper names
Hollow facades
Bounding boxes
Crafing recipe (assembly table?)
Look into multiple bounding boxes for pipes to be able to access stuff through the gaps
2012-07-13 21:55:26 +02:00
Krapht
8365d1ca35
Rewrote pipe world renderer to render from a state object instead of containing logic to calculate what to render. This state object can then be synced to the client to completely overwrite the client's view of the world
2012-07-13 21:55:25 +02:00
Krapht
19c4de5a1c
Refactoring of PipeWorldRenderer and initial commit of PipeRenderState
2012-07-13 21:55:25 +02:00
Krapht
eec4aa0323
Pulled the pipe world renderer out of core and put it in transport, also made the actual rendering a class of its own. Legacy world rendering not touched (quarry frames)
2012-07-13 21:55:25 +02:00
Krapht
9758782f19
Moved the rendering of Pipe items from mod_BuildcraftTransport to its own class
2012-07-13 21:55:24 +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
Krapht
984d5d67af
Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor
2012-07-12 05:57:32 +02:00
Krapht
02b1e4ae35
Rewrote pipe world renderer to render from a state object instead of containing logic to calculate what to render. This state object can then be synced to the client to completely overwrite the client's view of the world
2012-07-12 05:56:07 +02: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
