Commit graph

2125 commits

Author SHA1 Message Date
CovertJaguar
e4af7d00f6 Cleanup last commit 2013-10-13 08:22:31 -07:00
CovertJaguar
025387d47b Merge pull request #1275 from Eragonn1490/patch-1
Added Gears to Ore Dictionary
2013-10-13 08:18:11 -07:00
Eragonn1490
bab1e30d6c Added Gears to Ore Dictionary
Added Imports for OreDictionary
Added all the gears to the OreDictionary
2013-10-13 00:49:37 -04:00
CovertJaguar
925a14476b Mention Optifine in Issue reporting section 2013-10-12 17:23:00 -07:00
CovertJaguar
ef2eace03c Add Tank tiles 2013-10-12 17:13:40 -07:00
CovertJaguar
99fca02856 Fix Pipe Raytracing + Improve Pipe interactions
Closes #1246

Its now much easier and more consistent to remove specific addons from a
pipe. Sneak-click with a gate to remove a gate, sneak-click with a
Yellow Wire to remove a Yellow Wire, etc...

Plugs can now be placed easily and simply on any side of the pipe in any
configuration.

Selection Box now highlights the part of the pipe you are pointing at.
2013-10-11 19:16:57 -07:00
CovertJaguar
9cb53f9405 Fix NPE in ACT
Closes #1270
2013-10-11 06:06:11 -07:00
CovertJaguar
54b2e5de88 Revert "Fixed missing import"
This reverts commit 62f2ac032c.
2013-10-11 06:02:57 -07:00
CovertJaguar
eb0f10e098 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-10-11 06:02:45 -07:00
CovertJaguar
7daea136ea Revert "Fix Forge ore dictionary support for the Assembly Table"
This reverts commit 11c96949ec.
2013-10-11 06:02:22 -07:00
CovertJaguar
b297f29dfe Merge pull request #1271 from matthewprenger/master
Fixed missing import
2013-10-11 05:57:08 -07:00
Matthew Prenger
62f2ac032c Fixed missing import 2013-10-10 18:48:32 -05:00
CovertJaguar
16a6d768db Revert "Bugfix for non-world liquids"
This reverts commit 16a577e1eb.
2013-10-10 03:45:00 -07:00
Flow86
3a7c8c76a3 Merge pull request #1266 from ReikaKalseki/patch-1
Bugfix for non-world liquids
2013-10-09 23:04:28 -07:00
Reika
16a577e1eb Bugfix for non-world liquids 2013-10-10 00:37:31 -04:00
CovertJaguar
782cff2266 Merge pull request #1265 from viliml/patch-5
Fix Forge ore dictionary support for the Assembly Table
2013-10-09 15:58:18 -07:00
viliml
11c96949ec Fix Forge ore dictionary support for the Assembly Table
Fixes https://github.com/BuildCraft/BuildCraft/issues/531 .
Don't worry, I checked it and it has no errors and works as intended :D
2013-10-09 19:19:39 +02:00
CovertJaguar
3a39b289a2 Moved Pipe Gate/Wire rendering to the TESR
Should greatly improve performance of wire/gate switching.
2013-10-08 11:13:40 -07:00
CovertJaguar
fb0ee91183 Fix issues with Wooden Engine
Closes #1253
2013-10-08 11:02:14 -07:00
CovertJaguar
0a004e4383 Add configs for fuel values 2013-10-07 09:14:51 -07:00
Player
2a38a58fbb energy: nerf oil and fuel from 60k/600k to 15k/150k MJ/bucket. The power (3/6 MJ/t) is unchanged.
This change reduces the mismatch between the liquid and solid fuel energy value.
2013-10-07 17:01:50 +02:00
CovertJaguar
6eb39da66f Prevent Spring block updates on chunk gen 2013-10-06 15:26:35 -07:00
CovertJaguar
7bbb853aae Expand PowerHandler Javadocs some more 2013-10-05 07:46:47 -07:00
CovertJaguar
782002b458 Fix some texture fighting on Kinesis Pipes 2013-10-05 07:24:54 -07:00
CovertJaguar
f76c684162 Closes #1250
Don't know how it happened, but whatever.
2013-10-05 06:19:54 -07:00
CovertJaguar
de8da4c008 Some minor cleanup 2013-10-05 06:18:01 -07:00
CovertJaguar
b6cb556274 Fix version check 2013-09-27 22:13:26 -07:00
CovertJaguar
1a639f7afb Remove some unneeded imports 2013-09-27 22:13:25 -07:00
CovertJaguar
3e13bbb166 Version 4.1.0 2013-09-25 22:58:21 -07:00
Christian
f35ea290e5 Fix single pulse : account for the baked in energy loss.. 2013-09-26 00:01:12 -04:00
CovertJaguar
68b5c5267d Added Iron Kinesis Pipe
The Iron Kinesis Pipe allows you select its throughput limiter via
Wrench or Gate Action.

The possible values are: 2, 4, 8, 16, 32 , 64, and 128 MJ/t
2013-09-25 18:16:59 -07:00
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