Commit graph

2342 commits

Author SHA1 Message Date
SpaceToad
b3b4a33af4 removed useless check 2014-03-29 16:28:06 +01:00
SpaceToad
3cf50c69f6 Merge branch 'patch-2' of https://github.com/anti344/BuildCraft into anti344-patch-2 2014-03-29 11:35:53 +01:00
SpaceToad
7b275c1455 fixed conflicts 2014-03-29 11:34:41 +01:00
SpaceToad
40a594ef23 fixed conflict 2014-03-29 11:33:01 +01:00
SpaceToad
df2d09e176 generalized previous change 2014-03-29 11:07:46 +01:00
SpaceToad
4191f69e14 Merge branch 'patch-1' of https://github.com/anti344/BuildCraft into anti344-patch-1 2014-03-29 11:01:23 +01:00
CovertJaguar
ec0fe82252 Deps are case sensitive 2014-03-24 14:23:55 -07:00
Anton
cb47a11853 Added IMC support for adding assembly and refinery recipes.
I think we shouldn't dismantle API adding, since if i do a complete addon it'll be easier to use, than IMC.

PS Is this just in NextGen buckets-machines behavior is broken? Or whole 1.7.2?
2014-03-24 22:08:02 +02:00
Anton
5333c1d389 Fix everything.
Without expected exceptions! =D
2014-03-23 00:15:29 +02:00
SpaceToad
7e4b40f254 added support for crops, fix #1539 2014-03-22 18:42:30 +01:00
SpaceToad
d4038e763c fixed engine schematics, fix #1538 2014-03-22 18:18:30 +01:00
SpaceToad
eb2f436f42 fixed handling of double doors, fix #1535 2014-03-22 18:07:38 +01:00
SpaceToad
ebebba3282 prepare 5.0.4 version 2014-03-22 15:49:09 +01:00
SpaceToad
75ddd6fb01 added missing support for painting, close #1517 2014-03-22 14:57:57 +01:00
SpaceToad
1af2a7ece5 Further progress for entity support, #1517. 2014-03-22 14:47:42 +01:00
SpaceToad
583d09d82e Making progress with entity support in blueprints, for #1517.
Some refactorings, in particular removal of the clone operations for blueprints,
not needed anymore now that blueprints are loaded on demand by builders.
2014-03-22 11:56:12 +01:00
Anton
5cf6d34fae I'm stupid, it was in cycle. 2014-03-21 20:35:05 +02:00
Anton
e0cabc07f7 Fix adding unaccessible fields, and their check.
Lol.
2014-03-21 00:11:44 +02:00
Anton
3115a6e94d Fix awesome MjBattery thing for Scala
Since Scala compiler makes all fields private and creates getters and setters for them, i check, if there is a public(so private Scala fields doesn't count) Scala setter and if is, then set proper accessibility for the field.
You can also find some info about that in comments in cpw.mods.fml.common.ILanguageAdapter.ScalaAdapter class.

Tested.
2014-03-19 22:41:14 +02:00
SpaceToad
7bee2a9717 Merge pull request #1470 from fabricator77/BuildCraft-5.0.x
Restore bucket handler so empty buckets fill correctly.
2014-03-19 18:19:03 +01:00
SpaceToad
ba2d66e81a fixed rotation for action direction 2014-03-19 15:36:48 +01:00
SpaceToad
1984eca2ab prepare 6.0.3 release 2014-03-19 15:24:02 +01:00
SpaceToad
8a150e9064 fixed shameful out of bound exceptions, fix #1522 2014-03-19 15:18:43 +01:00
SpaceToad
3919a9dae8 added protection against world corruption, for #1521 2014-03-19 15:12:58 +01:00
SpaceToad
a37441e324 finished migration of pipes to simple energy system, close #1532 2014-03-19 14:46:23 +01:00
SpaceToad
0230f8772d made progress in pipe migration to the simple energy framework (#1532).
removed some OBE classes
2014-03-19 14:14:37 +01:00
SpaceToad
43f0c5cf5c added support for rotating actions and triggers, close #1515 2014-03-19 11:59:40 +01:00
SpaceToad
2d3d70f6db Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-19 11:36:15 +01:00
SpaceToad
e34a4b25a4 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-03-19 11:35:14 +01:00
SpaceToad
72742a24b1 added missing import and fixed format 2014-03-19 11:33:41 +01:00
SpaceToad
bf6f4621c5 fixed fluid behavior, close #1510 2014-03-19 11:24:46 +01:00
SpaceToad
8f3e836c7f implemented fire support in blueprints, close #1527 2014-03-19 11:09:30 +01:00
SpaceToad
957a9de907 Merge pull request #1534 from Goldman60/patch-1
Match build number to branch
2014-03-19 10:56:56 +01:00
SpaceToad
92ef765f25 fixed spelling 2014-03-19 10:56:10 +01:00
AJ Fite
515ab78f22 Match build number to branch
Mostly for my CI server #1523
2014-03-19 00:44:49 -07:00
SpaceToad
0ea21b9162 Finished implementation of stripes pipe (#1491 and #1512).
Started experiments migrating pipes to simpler energy framework (#1532)
2014-03-18 23:53:34 +01:00
SandGrainOne
8765dac0e3 Gates indicate that trigger require parameter
Also removing normal Inventory Triggers from FilteredBuffer, for now.
2014-03-18 23:00:04 +01:00
Anton
cb37886b22 Fix fluid icon 'compressing'. Another minor, that highly annoys me.
Used my universal method for any tank size.
It's opensource, after all, so that you can easily copy and use it xD
2014-03-18 23:47:06 +02:00
SpaceToad
2f1f60f987 Merge pull request #1529 from AbrarSyed/patch-2
fix maven uploading
2014-03-18 22:24:20 +01:00
Abrar Syed
8eea3a74e9 fix maven uploading 2014-03-18 16:08:36 -05:00
SpaceToad
4bf1d3cd49 implemented support for rail in blueprint, close #1516 2014-03-18 20:16:15 +01:00
SpaceToad
3c090c75f3 fixed default detection for tiles 2014-03-18 08:51:09 +01:00
SpaceToad
c08c1bc45a Changed instanceof BlockContainer to Block.hasEntity, close #1524. 2014-03-17 23:18:14 +01:00
SpaceToad
01323086cb added support for hopper in blueprints, for #1518 2014-03-17 21:22:18 +01:00
SpaceToad
e74fce7786 fixed blueprint support for redstone comparator, close #1519 2014-03-17 20:17:44 +01:00
SpaceToad
ef36d39b28 (hopefully) finished filler fixing, for #1513 2014-03-17 20:11:47 +01:00
SpaceToad
1a00a81731 further fixes in filler, for #1513 2014-03-17 08:59:09 +01:00
SpaceToad
664004a9d9 fixed NPE for #1513 2014-03-17 08:45:56 +01:00
SpaceToad
d28c9aa0a1 optimization for previous check-in 2014-03-16 21:17:38 +01:00
SpaceToad
3aeb961a31 Moved vanilla schematics in a non-API class
(this will allows fixes on minor versions).
Implemented portal support, for #1508.
2014-03-16 21:05:35 +01:00