Commit graph

1781 commits

Author SHA1 Message Date
CovertJaguar
e3fab2896d Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-09-25 17:49:06 -07:00
CovertJaguar
daf79abda5 Fix for Pumps
Closes #1224
2013-09-25 17:48:39 -07:00
CovertJaguar
72b5e2add8 Merge pull request #1239 from CaptainShadows/master
Ore Dictionary compatibility
2013-09-25 17:25:28 -07:00
Captain Shadows
8782d5125a Ore Dictionary compatibility
Changed some recipes to use the Ore Dictionary. Made shapeless
recipes use the Ore Dictionary. Also implemented the changes that CJ
asked for.

If there was another PR like this one(Not counting #1227, #1232, and
#1234), I would like to know why not?
2013-09-25 16:07:49 -04:00
CovertJaguar
22548ad2b1 Merge pull request #1225 from Zjarek/master
Fix for kinesis pipes content triggers
2013-09-24 10:17:45 -07:00
CovertJaguar
3c84c34bd9 Wooden Pipes shouldn't orient to pipes
Closes #1218
2013-09-24 10:17:21 -07:00
CovertJaguar
93290e0ad9 Merge pull request #1228 from sadris/oilgenfreq
Added oil well generation probability scalar to config file
2013-09-24 10:11:51 -07:00
CovertJaguar
6c76a9a8d6 Add flat taxing to PowerHandler for King Lemming
This should be a non-breaking API change.
2013-09-24 08:50:18 -07:00
Flow86
a52437b618 Merge pull request #1231 from Prototik/master
Add a config property for update check
2013-09-23 07:52:49 -07:00
Sergey Shatunov
83298c9b94
Add a config property for update check 2013-09-23 22:21:24 +08:00
Gordon H
4a017f355e Added oil well generation probability scalar to config file 2013-09-22 09:48:25 -04:00
Jaroslaw Szczesniewski
5f4d4c1008 Fix for kinesis pipes content triggers
Due to smoothing s>0 will always be true. All float values higher than 0
will work, however the lower the value, the longer the delay. Tested
with 1 stirling engine powering 16 pumps, s>0.001 caused flickering in
this case.
2013-09-22 01:24:51 +02:00
Flow86
ebdf3868f1 Merge pull request #1220 from Vexatos/patch-1
Update en_US.properties
2013-09-20 01:51:18 -07:00
Vexatos
11ed5b16dd Update en_US.properties
I think this sounds better. Please tell me your opinion about it.
2013-09-20 10:22:40 +02:00
Flow86
b7f173b7f2 place button in emerald pipe a bit better (ideas for better placement are welcome) 2013-09-19 12:51:40 +02:00
Flow86
74d2239dc7 added non blocking mode to emerald pipe
implements/closes #1195
2013-09-19 12:46:06 +02:00
Flow86
14db1ed0eb fix GuiMultiButton Tooltip handling 2013-09-19 12:46:06 +02:00
pahimar
378e6fd3bf Taking out some of my personal configurations, so that my net diff tonight is only adding the resources directory as a source directory for the eclipse project files 2013-09-18 22:16:22 -04:00
pahimar
dcc8e48325 Use the buildcraft_resources directory as a source directory so that
when running inside of Eclipse we map textures properly and get way less
spammy spam
2013-09-18 22:12:47 -04:00
Christian
bb7aa41b48 Fix Quarry in the nether. Closes a bunch of bug reports no doubt. 2013-09-18 09:56:55 -04:00
Flow86
5b4d661543 Update Pipe.java
fix NPE.

(see RS485/LogisticsPipes-Dev#182)
2013-09-17 08:49:06 +02:00
CovertJaguar
cde67912f6 Fix loop in TileEngine 2013-09-15 23:18:36 -07:00
CovertJaguar
1aaa35c5b1 Increase hardness of blocks 2013-09-15 23:18:14 -07:00
CovertJaguar
6f34a9fc80 Merge pull request #1206 from ganymedes01/master
Fix for sandstone pipes
2013-09-15 23:02:38 -07:00
ganymedes01
08c4bc3f47 Fix for sandstone pipes 2013-09-15 21:40:27 +01:00
CovertJaguar
2d65129722 More tweaks to improve mobility of blocks 2013-09-15 00:38:55 -07:00
CovertJaguar
56d46de1be Wooden Power Pipes can no longer output power
Prevents power loops when a machine both emits and accepts power.

Closes #1202
2013-09-13 20:47:16 -07:00
SirSengir
f0c1e7467f Clarify handling of code cleanup/formatting PRs. 2013-09-13 10:00:45 +02:00
CovertJaguar
74fd409330 Added Mining Config Options
Config options added:
* Mining Cost Multiplier, scales power usage of both Quarry and Mining
Well
* Max Depth, limited Quarry/Well to a certain depth below the block
* One Time Use Quarries, Quarry doesn't drop an item when broken, get it
right the first time (defaults to false)
2013-09-12 11:03:50 -07:00
CovertJaguar
880fd64e27 Engines should prefer facing pipes on placement 2013-09-12 11:03:32 -07:00
CovertJaguar
47d504d781 Merge pull request #1199 from ddoggy99/master
Cleaned up IMC code
2013-09-12 09:42:52 -07:00
ddoggy99
5e786d8902 Cleaned up IMC code 2013-09-12 23:27:11 +10:00
CovertJaguar
87bb24e263 Fix possible NPE in TankManager 2013-09-08 06:51:21 -07:00
CovertJaguar
1253534535 Add tooltips to all the Pipes 2013-09-06 15:49:52 -07:00
Christian
730a0ac4a7 Fix for updated MCP names 2013-09-03 18:13:32 -04:00
CovertJaguar
158c79c301 Clean up Obsidian Pipe code 2013-09-03 02:12:13 -07:00
CovertJaguar
ae77912afd Make Tanks emit light if the Fluid glows 2013-09-03 02:11:14 -07:00
CovertJaguar
ddc203fe59 Possible fix for #1182 2013-09-01 04:51:50 -07:00
CovertJaguar
57c58036b7 Working out the kinks 2013-08-31 18:31:15 -07:00
Krapht
c6ca3b28e7 Move implementation of IInventory from TileEngine to new abstract class TileEngineWithInventory.
This will effectivly remove IInventory from redstone engines.
Fixes #1180
2013-08-31 22:17:50 +02:00
Krapht
f6b0f8a1f2 Added a BuildCraftCore config option for color-blind mode.
Added alternate textures for Diamond pipe interface and the green side of diamond
2013-08-31 19:01:31 +02:00
CovertJaguar
f02295bac4 Flood Gate shouldn't put water in the Nether 2013-08-29 10:38:08 -07:00
CovertJaguar
f2f1828386 Limit Coolant per tick rather Cooling per tick
Makes better Coolants more desirable because they can cool faster.
2013-08-29 07:27:56 -07:00
CovertJaguar
48daafae35 Reworked Iron Engine Heat Mechanics
They cool down much faster, but use Coolant while doing so.
Additionally, they are affected by Biome temperature. Expect to need
more water/better Coolant in a desert for optimal operation. Ice Blocks
are also recommended.
2013-08-29 07:07:11 -07:00
CovertJaguar
45e73c28b1 Fix Laser's hasWork trigger 2013-08-29 04:51:28 -07:00
CovertJaguar
54e7e372ec Make pipes with solid end consistant 2013-08-28 19:37:56 -07:00
CovertJaguar
cfd89df7b9 Make Plugs more visible in hand 2013-08-28 19:36:59 -07:00
CovertJaguar
5cd49d2f8c Update pipe contents localization 2013-08-26 18:34:30 -07:00
CovertJaguar
4609d74a8e Fix Refinery Filters 2013-08-25 12:59:59 -07:00
CovertJaguar
c625b5484c Add Chests to rotations requiring sneaking 2013-08-24 17:26:49 -07:00