Commit graph

964 commits

Author SHA1 Message Date
SirSengir
7599501135 Merge pull request #458 from psxlover/localization
Change localization to allow mapping inheritance.
2012-11-29 07:13:52 -08:00
psxlover
476a03d998 Change localization to allow mapping inheritance. Now a language like es_AR can use the mappings from a parent language (es_ES) instead of duplicating them, and only specify the ones that are different from the parent.
The child languages only need a field specifying the parent language e.g.:
language.parent=es_ES

Any mappings that are not specified in the file will be inherited from the father language.
2012-11-29 15:45:23 +02:00
SirSengir
ad111637ac Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-28 22:17:07 +01:00
SirSengir
e911404459 Fixed pass-through of mouse coordinates for gui tooltips. Closes #449 2012-11-28 22:16:22 +01:00
gishicrafter
f7b77f589c Use LiquidTank
Revert RefineryRecipe
2012-11-29 00:30:45 +09:00
CovertJaguar
8a36fbda50 Replaced ints with shorts in liquid packet 2012-11-27 03:55:20 -08:00
CovertJaguar
4db1a27d4f Liquid Pipes network optimization
Pipes are much smarter about whether they need to send a liquid update
packet, additionally the packets themselves now describe a delta rather
than sending a complete set of information every update.
2012-11-26 09:51:20 -08:00
CovertJaguar
9e39d1fcdc Merge pull request #452 from helinus/patch-1
Quick build.xml update to Minecraft 1.4.5
2012-11-26 05:51:28 -08:00
CovertJaguar
df33b905b8 Engines should have a block name 2012-11-26 05:48:58 -08:00
helinus
40eacd08e0 Update build.xml to Minecraft 1.4.5
Update MCP and Forge versions to work with MC 1.4.5
2012-11-26 13:40:12 +01:00
SirSengir
c531adea0d Merge pull request #446 from nevercast/issue-445
Fixed issue 445
2012-11-26 00:22:27 -08:00
SirSengir
79172e20be Merge pull request #451 from psxlover/LaserPlacement
Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450).
2012-11-26 00:21:26 -08:00
psxlover
bae2be096a Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450).
Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450).
2012-11-26 02:06:44 +02:00
gishicrafter
df727f0bd1 Fixed some devices that couldn't handle meta sensitive liquids correctly. 2012-11-25 12:04:04 +09:00
NeverCast
8749de2f19 Fixed issue 445 2012-11-25 13:07:35 +13:00
CovertJaguar
02662975c1 Merge pull request #443 from tcooc/patch-8
Fix trees destroying pipes.
2012-11-24 15:16:00 -08:00
tcooc
369852639e Unnecessary import. 2012-11-24 17:17:08 -05:00
tcooc
560cee32b4 Fix trees destroying pipes. 2012-11-24 17:13:43 -05:00
CovertJaguar
81ab0bcc95 Merge pull request #402 from Runetinal/master
Fix blockActivated not being called on client
2012-11-24 10:21:19 -08:00
CovertJaguar
36ef2cb61a Merge pull request #442 from narc0tiq/master
Bug report + fix: NullPointerException at [...](GuiRefinery.java:85)
2012-11-24 10:19:01 -08:00
Octav Sandulescu
87bddae480 Guard against an NPE in the refinery GUI. 2012-11-24 09:44:21 +02:00
CovertJaguar
ecc3f98024 Reduced the range of Pipe update packets
They are only used for rendering, no need to send them to people who are
beyond the render distance.
2012-11-23 20:50:31 -08:00
CovertJaguar
1817ae6936 Rewrote the Pipe Contents packet
Probably cut the packet length in half, there was a lot of unneeded
bytes.

Also removed the chunkPacket marker. This is not a high priority packet.
2012-11-23 05:54:18 -08:00
SirSengir
cd49e61f57 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-21 19:38:31 +01:00
SirSengir
16649e732b Updated readme. 2012-11-21 19:37:50 +01:00
SirSengir
94f541b67d Merge pull request #432 from AtomicStryker/master
Make Buildcraft use Forge autoassign for Block and Item IDs
2012-11-21 07:56:45 -08:00
AtomicStryker
a787a37fcb Fixed config BlockIDs and ItemIDs to use Forge autoassign
Because there is only like fifteen Forge contributors making this
2012-11-21 12:50:31 +01:00
SirSengir
a5117ca3a8 Changes for 3.2.0 build. 2012-11-20 22:30:28 +01:00
Christian
ee6d0c801d Test directional tank behaviours for RP2 pipe interaction capability. 2012-11-18 18:00:34 -05:00
SirSengir
eace433066 Removed unneeded imports - set Eclipse to display a warning to remind you. 2012-11-18 22:34:57 +01:00
Runetinal
bae8444528 Use ordinal() instead of values() 2012-11-18 14:46:52 -06:00
CovertJaguar
f5d9bfa6c9 Fixed imports & updated build.xml 2012-11-17 08:04:57 -08:00
CovertJaguar
b1b950cc3e Fixed derp 2012-11-17 02:55:51 -08:00
CovertJaguar
379fa45a46 Adjusted Lifespan of Item drops
Added a config option for the lifespan of items dropped by pipes and
machines.

Its possible I missed some drop code, it seems to be scattered all over
the place.
2012-11-17 02:44:33 -08:00
SirSengir
df4531e839 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-17 09:13:39 +01:00
SirSengir
12746f2a2c Fixed more instances where inventoryContainer was used instead of openContainer. 2012-11-17 09:13:08 +01:00
cpw
7cad641232 Merge pull request #424 from nevercast/master
Fixed game breaking power bug!
2012-11-16 19:25:16 -08:00
NeverCast
6bc2ae8e14 Fixed game breaking power bug 2012-11-17 16:19:35 +13:00
Christian
fb1e41f4ba Clean up print statement spam 2012-11-16 21:00:11 -05:00
Christian
dc82c9ace6 It's openContainer, not inventoryContainer. Also fix network update stuff 2012-11-16 20:24:08 -05:00
Christian
42f90b109a Probably render not network updates needed 2012-11-16 18:58:43 -05:00
SirSengir
d79959f11e Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-16 23:47:41 +01:00
SirSengir
b10e0822c6 MC 1.4.5 update. (MCP mappings only.) 2012-11-16 23:45:37 +01:00
CovertJaguar
94b60bfad4 Fixed liquid triggers to actually be useful
How filters were handled was completely stupid when more than one tank
was involved.

Evaulation is now done via the fill/drain functions to simulate actually
interacting with the tank.
2012-11-15 22:44:15 -08:00
Christian
3be0523c4d For latest forge 2012-11-15 06:43:55 -05:00
Christian
042067483d Fix refineries running constantly.
Power pipes dissipate stored energy if none is input.
2012-11-14 23:25:09 -05:00
Christian
15bcb22032 Fix for new Liquid API 2012-11-14 23:25:09 -05:00
SirSengir
26173cf35c Fixed accidental edit conflict. 2012-11-14 16:48:59 +01:00
SirSengir
8a6d6b0ffe Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-14 16:47:23 +01:00
SirSengir
0fa4fd8bee Removed several unneeded imports/variables. 2012-11-14 16:47:08 +01:00