Commit graph

1895 commits

Author SHA1 Message Date
CovertJaguar
6b8ec69b37 Store owner information in the Tile 2013-11-25 12:44:01 -08:00
CovertJaguar
5c10517acb Merge branch 'emzuli' 2013-11-25 12:27:32 -08:00
CovertJaguar
1b2f2ae730 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-11-25 12:27:23 -08:00
CovertJaguar
65bff981e5 Fix block placement sync
Closes #1334
Closes #1335
2013-11-25 05:59:05 -08:00
CovertJaguar
81b45b692e Fix Emzuli tooltip 2013-11-24 07:24:08 -08:00
CovertJaguar
cc8c707c46 Rename Lapis Pipe to Lazuli Pipe 2013-11-24 07:21:48 -08:00
CovertJaguar
52ce3ac8c3 Fix full inv item bounce client animation 2013-11-24 07:09:01 -08:00
CovertJaguar
0f63603bd6 Rework Diazuli Pipe routing to handle overflow 2013-11-24 06:50:23 -08:00
CovertJaguar
023a5d51fb Some cleanup 2013-11-24 06:31:40 -08:00
CovertJaguar
6f57b4a80d Logemerald->Emzuli Rework + PipeEvents
Modified Logemerald:
-Added ability to paint items as they are extracted
-Renamed to Emzuli, texture and recipe changed accordingly

PipeEvents:
-Added PipeEvents a replacement for Hook interfaces, precursor to 1.7
Pipe API
-Implement methods with signature "eventHandler(PipeEventClass event)"
to receive events

Widgets:
-General improvements for use as a button
2013-11-24 06:23:37 -08:00
CovertJaguar
14dc0014c9 Prevent NPE in Coolant API 2013-11-23 23:23:38 -08:00
CovertJaguar
b301571629 Merge branch 'master' into emzuli 2013-11-23 12:30:04 -08:00
CovertJaguar
9b724724b4 Merge branch 'master' of git://github.com/SandGrainOne/BuildCraft into SandGrainOne-master 2013-11-23 12:28:24 -08:00
CovertJaguar
5d5d5a2706 Merge branch 'SandGrainOne-master' 2013-11-23 12:25:57 -08:00
CovertJaguar
25d411ce1a Merge Filler into Master 2013-11-23 12:25:15 -08:00
CovertJaguar
b5fc98ad2c Merge branch 'master' of git://github.com/SandGrainOne/BuildCraft into SandGrainOne-master 2013-11-23 11:49:39 -08:00
CovertJaguar
d17fd45f27 Merge pull request #1330 from taelnia/master
Fix for invalid gate type(pulser or not) for re-loaded worlds.
2013-11-23 11:43:01 -08:00
Taelnia
71ebc1fb69 Fix for creative mode pick block on gates for re-loaded worlds.
Also fixes Highlight Overlays such as NEI and Waila
2013-11-23 02:21:40 -05:00
CovertJaguar
5971a75e42 Allow Draining of Fuel in Iron Engine 2013-11-22 15:18:43 -08:00
SandGrainOne
ec4ed4df99 Adding Logemerald pipe
This is an action sensitive extraction pipe. The pipe can be configured
with 4 different items and actions will decide which one to extract from
the connected inventory.
2013-11-21 20:57:18 +01:00
CovertJaguar
7ee48c9cbd Fix Fluid Localization 2013-11-20 20:32:11 -08:00
CovertJaguar
b89e5718db Merge branch 'master' into filler 2013-11-20 20:21:54 -08:00
CovertJaguar
28a06b0973 Reduce the amount of spam when building 2013-11-20 20:20:05 -08:00
CovertJaguar
e7c5090e1e Pumps can now be disabled with redstone 2013-11-20 20:13:38 -08:00
CovertJaguar
9d4b1b9782 Move ILaserTarget to the power API 2013-11-20 17:27:28 -08:00
CovertJaguar
d1a1ad9d01 Merge pull request #1328 from DemoXinMC/master
BlockUtil & HarvestDropsEvent Update
2013-11-19 18:15:44 -08:00
DemoXin
9631ef5de6 * BlockUtil.getItemStackFromBlock() now properly posts HarvestDropsEvent and loads its results for compatibility.
* BlockUtil.breakBlock() now utilizes BlockUtil.getItemStackFromBlock() to get its drop list.
2013-11-19 21:02:30 -05:00
CovertJaguar
fbffebeef5 Housecleaning 2013-11-19 17:18:19 -08:00
CovertJaguar
d870fcb182 Fix Emerald Pipe Button Tooltip
Closes #1322
2013-11-19 06:11:20 -08:00
CovertJaguar
f1bec62b90 Rewrite previous Assembly Table commit
Yeah...there were better ways to do that...
2013-11-19 05:26:30 -08:00
CovertJaguar
2b4878a0e7 Merge pull request #1321 from taelnia/AssemblyRecipeOreDict
Changes to AssemblyRecipe to support OreDict
2013-11-19 04:45:09 -08:00
CovertJaguar
0f5a47f31f Fairly Major Filler Rework
Changes:
-The "crafting grid" is gone.
-API completely reworked
-Patterns can be "stateful", this could bring major improvements to the
scanning algorithms if utilized
-You can change the pattern via Gate Actions
-Various peripherally related GUI framework changes
2013-11-19 03:54:37 -08:00
Taelnia
26572907bc Changes to AssemblyRecipe to support OreDict
- Moved AssemblyRecipes to Init phase in BuildCraftTransport so that the

OreDictionary is completed by then
- Added new AssemblyRecipe constructor that can take ore tag strings
paired with a desired stack size
- Changed pipe wires over to new constructor
2013-11-16 20:19:54 -05:00
CovertJaguar
b37f33c104 Merge pull request #1320 from taelnia/IronPipeFacingFix
Prevent Iron Pipes from switching to plugged output
2013-11-16 16:22:58 -08:00
taelnia
372941c32f simplify code for iron pipe facing check 2013-11-16 11:23:37 -05:00
CovertJaguar
05fedb059e Buff Oil Spring output
It should now produce 4x time amount of Oil, resulting in the same
energy output from before the Oil nerf.
2013-11-15 21:20:46 -08:00
taelnia
91e5648903 Prevent Iron Pipes from switching to a plugged side 2013-11-15 22:32:30 -05:00
Taelnia
e825066fd0 Revert "Add Ore Dictionary support for Assembly Recipes"
This reverts commit 3d1815595b.
2013-11-15 22:27:30 -05:00
taelnia
3d1815595b Add Ore Dictionary support for Assembly Recipes 2013-11-15 21:07:15 -05:00
CovertJaguar
696c206792 Register all items with FML so they survive 1.7 2013-11-13 17:23:41 -08:00
SirSengir
344218bd9b Merge pull request #1314 from smbarbour/patch-2
CraftingHelper - Properly name the variables
2013-11-13 11:22:43 -08:00
Scott M. Barbour
7073a10fc5 CraftingHelper - Properly name the variables 2013-11-13 10:37:24 -06:00
CovertJaguar
1e00cf012b Possible fix for Pipe placement sync issue
Theoretically this should send an update on placement to all watching
players so everyone can see the pipe.
2013-11-05 16:28:21 -08:00
CovertJaguar
40e1ecc671 Merge pull request #1307 from bdew/master
Workaround for scala compiler derp
2013-11-05 14:57:06 -08:00
bdew
9a8f9606cf Workaround for scala compiler derp 2013-11-02 11:25:22 +02:00
CovertJaguar
643545b271 Split API into individual sections
Yes, I know this fails.  Don't use it. It needs to be fixed on FML's
side.
2013-10-30 23:16:03 -07:00
Christian
0aad0c785b Add in API markers for all the BC API packages. They come under the umbrella "BuildCraftAPI", expect warnings from now on if you don't include these in your BC dependent mods. 2013-10-30 23:09:35 -04:00
CovertJaguar
7504777ecc Merge pull request #1304 from taelnia/master
Adjusted FluidContainerTrigger to pass through the side being checked
2013-10-30 18:10:15 -07:00
taelnia
17ff442867 Adjusted FluidContainerTrigger to pass through the side being checked 2013-10-30 15:54:31 -04:00
CovertJaguar
7f73cc2691 Clean up Gate GUIs a bit
Size them appropriately and align the slots properly.
2013-10-29 03:08:22 -07:00