Andrew Dudney
38bad1b5c4
Reverted previous change, I modified the wrong branch.
2014-04-26 12:01:55 -06:00
Andrew Dudney
329850d4ea
Re-added block breaking
2014-04-26 12:00:44 -06:00
Andrew Dudney
33ad9fee93
Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen
2014-04-26 11:58:57 -06:00
SpaceToad
046564f253
fixed laser animation, close #1629
2014-04-26 19:56:24 +02:00
Andrew Dudney
1abc6ec68f
Changed hardness to a linear relationship rather than a clamping one.
2014-04-26 11:55:25 -06:00
Andrew Dudney
e931f9b4e5
Merged Main Repo NextGen, disabled Filler Block Breaking in this branch.
2014-04-26 11:41:18 -06:00
SpaceToad
69c8d75371
fixed loading of destroying builders blocks, fix #1623
2014-04-26 17:52:09 +02:00
SpaceToad
5a8000707d
replaced BC-specific constants with Forge-specific ones
2014-04-26 16:50:23 +02:00
SpaceToad
aa6d085e8b
added protection against filler errors and fixed array out of bounds for cylinder, fix #1604
2014-04-26 16:39:26 +02:00
SpaceToad
c5a912a222
refactored to isolate API related functions, fix #1615
2014-04-26 16:10:57 +02:00
SpaceToad
5812d4f0bf
Merge branch 'BuildCraft-5.1.x' into NextGen
...
Conflicts:
buildcraft_resources/assets/buildcraft/lang/en_US.lang
common/buildcraft/energy/BlockEngine.java
common/buildcraft/factory/BlockTank.java
common/buildcraft/transport/pipes/PipeItemsEmerald.java
2014-04-26 13:39:01 +02:00
SpaceToad
3fc344c9b9
Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x
2014-04-26 13:12:48 +02:00
SpaceToad
98d8861ea3
migrated to forge 60 and gradle 1.2
2014-04-26 13:12:28 +02:00
SpaceToad
35791deb88
minor reformating
2014-04-26 10:21:54 +02:00
SpaceToad
2ce577bd39
Merge branch 'NextGen' of https://github.com/AlexIIL/BuildCraft into AlexIIL-NextGen
2014-04-26 10:20:53 +02:00
Andrew Dudney
c316ffe30b
Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen
2014-04-21 11:49:42 -06:00
dmillerw
d2214afee7
Fixed gates rendering incorrectly in GUIs
2014-04-21 07:21:05 -07:00
Andrew Dudney
98b68810a3
Fixed order of operations causing Has Work to flicker on and off when pointed at a clear Filler in loop mode that currently had no blocks to clear. Also fixes Fillers running while done and not in loop mode.
2014-04-21 02:20:26 -06:00
Andrew Dudney
7e5e277a4c
Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen
2014-04-21 02:17:32 -06:00
SpaceToad
5d955a2e0d
Merge pull request #1612 from TXX59/NextGen
...
Remove deprecated/redundant code in main classes
2014-04-20 19:04:06 +02:00
Andrew Dudney
1acc342af6
Removed redundant call to get the destination position for BuildingItem.
2014-04-19 16:09:37 -06:00
Andrew Dudney
2296519573
Changed minimum hardness to 1, so that digging dirt is no longer a free operation. Changed breaking blocks to have only the exact amount of red cubes sent toward them equal to their hardness.
2014-04-19 16:04:18 -06:00
Andrew Dudney
0799147b3f
Merge branch 'NextGen' of https://github.com/adudney/BuildCraft into NextGen
2014-04-19 15:01:53 -06:00
Andrew Dudney
18f4c97f8b
Re-added blocks dropping when filler clears them, this also applies to quarries and builders.
2014-04-19 15:01:25 -06:00
AlexIIL
9d9b134859
Update ReflectMjAPI.java
...
Removed a potential NPE (this can occur when a class contains a null mjBattery object)
2014-04-19 16:07:57 +01:00
robin4002
42d0e641b8
Fix ClassCastException in tile entity, close #1584
2014-04-19 15:27:00 +02:00
SpaceToad
b30995aea0
attempt at fixing blueprint building ordering, for #1620
2014-04-19 11:33:57 +02:00
SpaceToad
ee349e00b5
added mode where air blocks are not cleared by blueprint, close #1562
2014-04-18 23:05:34 +02:00
SpaceToad
6c42fd02bc
fixed flatten and horizon filler patterns, fix #1598
2014-04-18 20:24:29 +02:00
SpaceToad
b8ec7635da
fixed cactus handling in blueprint, fix #1597
2014-04-18 19:51:07 +02:00
SpaceToad
f4d1107066
fixed bed handling in blueprints, close #1617
2014-04-18 19:18:30 +02:00
SpaceToad
c5512cc42f
fixed previous check-in for #1575
2014-04-18 09:25:32 +02:00
SpaceToad
d1dbabdabd
completed builder status save, for #1575
2014-04-18 08:50:48 +02:00
SpaceToad
22f0ecdd36
finished saving state for blocks, for #1575
2014-04-18 08:23:48 +02:00
SpaceToad
b93c700a8a
minor progress in saving builder state, for #1575
2014-04-17 21:00:56 +02:00
TXX59
1ab8cd96f9
Change back to Stirling Engine as requested by ST.
2014-04-16 21:07:44 +01:00
dmillerw
8fd7eb4f91
Merge pull request #1609 from dmillerw/engine
...
Fixed creative engine desync
2014-04-14 15:54:31 -07:00
SandGrainOne
fd9d9272b7
Change wire in recipe for gold gates
2014-04-14 20:38:24 +02:00
TXX59
11cdba5686
Remove deprecated/redundant code in main classes
...
I've done a bit of cleanup in the BuildCraft code by removing any
redundant/unnessecary little things and removing all deprecated
LanguageRegistry methods from main mod classes.
2014-04-14 17:27:59 +01:00
SpaceToad
a4744e6632
Merge pull request #1610 from robin4002/NextGen
...
Fix server crash
2014-04-14 17:09:57 +02:00
SpaceToad
d0994d6f6e
Merge pull request #1607 from TXX59/NextGen
...
NextGen Achievements
2014-04-14 17:09:10 +02:00
robin4002
67c541676b
Fix server crash
2014-04-14 14:07:52 +02:00
SandGrainOne
080b4ba749
Cylinder pattern was missing the name
2014-04-14 09:42:27 +02:00
SandGrainOne
d5055969b0
Oil spouts wasn't visible above the ocean surface.
2014-04-14 01:00:51 +02:00
SandGrainOne
7d309d3399
Black list option for Emerald item pipe
...
Swapped out the multi state button with a button row.
Added a new button type with interfaces.
2014-04-13 22:08:33 +02:00
dmillerw
621a3f7525
Added missing header
2014-04-13 13:08:10 -07:00
dmillerw
b19eea0867
Merge remote-tracking branch 'bc/NextGen' into engine
...
Conflicts:
common/buildcraft/energy/TileEngineCreative.java
2014-04-13 13:00:32 -07:00
dmillerw
2cc2183e23
Fixed creative engine desync
2014-04-13 12:59:40 -07:00
SpaceToad
e15ecdbac9
made progress in saving building items, for #1575
2014-04-13 19:22:41 +02:00
TXX59
0d0fd91d9d
Oh hey look, another hotfix...
2014-04-13 17:25:20 +01:00
