Commit graph

2482 commits

Author SHA1 Message Date
SpaceToad
bdd646dbdd fixed behavior of redstone in blueprints, fix #1651 2014-04-30 20:44:21 +02:00
SpaceToad
5353198eaa completed previous check-in, for #1650 2014-04-30 20:36:57 +02:00
SpaceToad
c657fee0a1 added notion of standalone block in schematic, fix #1650 2014-04-30 20:36:29 +02:00
SpaceToad
708b9b63cd minor tweaks to builder algorithmics 2014-04-30 20:28:12 +02:00
SpaceToad
9e397870a2 Merge branch 'Prototik-api' into NextGen 2014-04-30 20:01:37 +02:00
Prototik
11b0b412b7 Split api and main classes to different source sets.
This means a separate api jar and no more inconsistencies between api
and core. (fix #1653)
2014-04-30 21:03:12 +08:00
SpaceToad
45be48842f fixed compilation error 2014-04-30 09:32:33 +02:00
SpaceToad
0817c409ee Adjusted semantics of path markers to fix vertical building, fix #1514 2014-04-30 09:30:52 +02:00
SpaceToad
7f3978cc18 fixed compilation error and minor formating 2014-04-28 20:58:20 +02:00
SpaceToad
877940fb70 prepare 6.0.7 version 2014-04-28 20:09:06 +02:00
SpaceToad
3411d023a5 Merge branch 'BuildCraft-5.1.x' into NextGen 2014-04-28 20:05:39 +02:00
SpaceToad
2248a2fb4d Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-28 20:05:16 +02:00
SpaceToad
00e2cea2ff fixed quarry glitches, close #1640 2014-04-28 20:01:15 +02:00
dmillerw
b1be97331c Show wire type in phased facade tooltip 2014-04-27 18:31:23 -07:00
dmillerw
b6352e71d0 Allow for levels on facades to power pipe redstone 2014-04-27 16:15:52 -07:00
dmillerw
ecfb6e8ca4 Added phased facades 2014-04-27 16:07:46 -07:00
SpaceToad
da32b9f43e Temporary deactivated click location retreival, fix #1639 2014-04-27 17:47:40 +02:00
SpaceToad
a4205745fc Fixed extension for templates, and added templates support in the library.
Close #1614
2014-04-27 17:44:37 +02:00
SpaceToad
fb6a7b740f fixed again max energy stored in builder 2014-04-27 16:41:03 +02:00
SpaceToad
5fe74fe34b fixed condition for slot removal 2014-04-27 16:29:09 +02:00
SpaceToad
8c16501ee5 Made sure that blocks that are not build still issue breaking blocks.
Fix #1585 and #1622.
2014-04-27 16:20:59 +02:00
SpaceToad
e0f0e1dab6 increased amount of energy storable in builders and fixed infinite loop 2014-04-27 13:57:31 +02:00
SpaceToad
9b77c7d5f3 fixed quarry producing frame when destroyed, close #1632 2014-04-27 12:56:14 +02:00
SpaceToad
0abcd33e36 further fixes for lasers 2014-04-27 12:48:48 +02:00
SpaceToad
ce6e03a43a added rotation support for anvil and ender chests, part of #1580 2014-04-27 12:37:41 +02:00
SpaceToad
ebb4165670 added support for skulls in blueprints, part of #1580 2014-04-27 12:20:12 +02:00
SpaceToad
6186504d14 added support for trip wire hook, part of #1580 2014-04-27 11:45:57 +02:00
SpaceToad
e3edd9eda8 removed class added by mistake 2014-04-27 11:05:27 +02:00
SpaceToad
3a1c4acd26 Fixed builders not emptied in survival, for #1601.
Refactored StackUtil class to use static members.
2014-04-27 11:03:18 +02:00
Andrew Dudney
0f50e83564 Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen 2014-04-26 12:06:16 -06:00
Andrew Dudney
38bad1b5c4 Reverted previous change, I modified the wrong branch. 2014-04-26 12:01:55 -06:00
SpaceToad
2cecbcb18f removed OBE classes 2014-04-26 20:00:49 +02: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
f0fe057371 Merge branch 'BuildCraft-5.0.x' of https://github.com/CrustyJew/BuildCraft into CrustyJew-BuildCraft-5.0.x 2014-04-26 16:53: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
Meepster
1a1bb18a7a Forgot to trim ids.. Oops.. 2014-04-25 16:02:53 -05:00
Meepster
a6fa406793 Enabled use of BiomeDictionary.Type to pass in addition to IDs of
biomes. Added error handling. Doesn't seem to print the warning to the
log correctly though, just prints a string as info it looks.
2014-04-25 15:46:05 -05:00
Meepster
6892234a54 Changed Oil Generation to use config file ID's for generation to support
integration with mods like Biomes O' Plenty
2014-04-24 23:40:40 -05:00