Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2753 commits 1 branch 0 tags 19 MiB
Commit graph

2146 commits

Author SHA1 Message Date
SpaceToad
7cdddf3361 Improved blueprint unique id recognition in file names. 
Increased length of blueprint names and use standard text UI in the architect.
Close #1713
 2014-05-06 11:14:35 +02:00
Prototik
93d1fb49e6 Add AverageUtil and using it for energy rate computing in assembly 
tables
 2014-05-06 15:40:10 +08:00
SpaceToad
c09772d5d4 Added a more generic air storage avoidance in blueprints, close #1712. 2014-05-06 09:38:16 +02:00
SpaceToad
658e10b12d fixed max size of library slots, close #1710 2014-05-06 00:10:51 +02:00
SpaceToad
99f1a27ccd Merge branch 'architecttableimprovement' of https://github.com/tambry/BuildCraft into tambry-architecttableimprovement 2014-05-06 00:05:23 +02:00
SpaceToad
21fd683e58 Re-activated version check and changelog extracting, now based on github files. 
Close #1709
 2014-05-05 23:54:23 +02:00
Raul Tambre
ee7c3a8f7f Fix being able to place items in architect table output 2014-05-05 21:52:02 +03:00
SpaceToad
a66ba2f637 fixed version checking 2014-05-05 20:31:23 +02:00
SpaceToad
eee2c2272f fixed last java warnings 2014-05-05 19:45:11 +02:00
SpaceToad
27f858e2b5 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/transport/PipeConnectionBans.java
 2014-05-05 19:35:24 +02:00
SpaceToad
766495e75b Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-05 19:10:36 +02:00
SpaceToad
a76e98b98d removed obsolete properties 2014-05-05 19:10:24 +02:00
SandGrainOne
7b6f66db02 Fixed pipe connection bans 
Fixes #1707
 2014-05-05 19:00:03 +02:00
Raul Tambre
eb62240e02 Fix a typ 2014-05-05 19:03:24 +03:00
SpaceToad
fe5e734b64 Added provision for blueprints with non existing blocks and entities. 
Close #1702
 2014-05-05 17:01:48 +02:00
SpaceToad
03dfd35b47 stairs are standalone blocks 2014-05-05 16:27:01 +02:00
SpaceToad
3629e76ad0 tanks are standalone blocks 2014-05-05 16:22:22 +02:00
SpaceToad
b45ba8a93d engines are standalone blocks 2014-05-05 16:20:56 +02:00
SpaceToad
f4866fa883 improved movements of building items 2014-05-05 16:18:04 +02:00
SpaceToad
29239111ad fixed potential NPE 2014-05-05 16:09:30 +02:00
SpaceToad
62e21a45b8 fixed builder position error when no energy, fix #1701 2014-05-05 15:33:47 +02:00
SpaceToad
9877f8df63 fixed javadoc errors 2014-05-05 14:54:39 +02:00
SpaceToad
250db91750 Merge branch '16stack' of https://github.com/tambry/BuildCraft into tambry-16stack 2014-05-05 14:42:13 +02:00
SpaceToad
f02dda793d Merge branch 'gate-triggers-plugs' of https://github.com/Prototik/BuildCraft into Prototik-gate-triggers-plugs 2014-05-05 14:37:51 +02:00
Prototik
960e98dc3d Make block gate triggers by plugs 2014-05-05 20:29:28 +08:00
Raul Tambre
38f74d42f0 Also some blueprint and template cleanup 2014-05-05 15:11:45 +03:00
Raul Tambre
6aaf47b7f9 Make blank blueprints and templates stack to 16 2014-05-05 15:06:03 +03:00
SpaceToad
52bedc0bd4 minor adjustments in building items display and costs 2014-05-05 13:52:26 +02:00
SpaceToad
cf54f0e68a improved biome setting for oil generation 2014-05-05 12:55:40 +02:00
SpaceToad
5ad4b53120 minor refactorings 2014-05-05 11:15:17 +02:00
SpaceToad
ebe0b1c0f6 Merge branch 'power-legacy' of https://github.com/Prototik/BuildCraft into Prototik-power-legacy 2014-05-05 11:01:19 +02:00
SpaceToad
668738f4fe removed obsolete property 2014-05-05 10:57:41 +02:00
Prototik
aa68c3cd81 Add MjAPILegacy for providing an old-style api for the new power api. 
Add Energy Converter block for the same things in game.
 2014-05-05 16:21:25 +08:00
SpaceToad
890f14bcfe Merge branch '16stack' of https://github.com/tambry/BuildCraft into tambry-16stack 2014-05-05 10:11:36 +02:00
SpaceToad
c31654c864 Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-04 23:38:53 +02:00
Raul Tambre
efecafdf9a Fix rendering of blueprints and templates 2014-05-04 22:34:26 +03:00
Raul Tambre
5033dace6c Fix the fix for the fix of red dot 2014-05-04 22:07:26 +03:00
SpaceToad
61157af356 Merge pull request #1695 from jk-5/patch-1 
See #1690. Let checkstyle fail builds when some rules are violated
 2014-05-04 20:31:31 +02:00
jk-5
7e5fe9f7bb Fix checkstyle 2014-05-04 20:21:50 +02:00
Raul Tambre
37b765083c Better fix to laser dot, fix #1692 2014-05-04 20:58:30 +03:00
SpaceToad
e230d9a3f2 factorized out some of the code 2014-05-04 18:34:08 +02:00
SpaceToad
949d8054c4 Merge branch '6.0.x' of https://github.com/AEnterprise/BuildCraft into AEnterprise-6.0.x 2014-05-04 18:27:01 +02:00
SpaceToad
aca1678591 requirements extraction is now cleaner 2014-05-04 18:25:28 +02:00
AEnterprise
810ff8b07d fix space before ) on the realBueprintDeployer 2014-05-04 18:17:10 +02:00
AEnterprise
01bf28a77d fix for the blueprint deployer 2014-05-04 17:11:38 +02:00
SpaceToad
decc8ccf10 added missing tranformation in deployer 2014-05-04 15:57:59 +02:00
SpaceToad
4518b0f247 added missing network update call after removing blueprint 2014-05-04 14:33:34 +02:00
Prototik
ecd10b9772 Fix pumps 2014-05-04 14:20:52 +08:00
SpaceToad
8b22700803 fixed previous commit 2014-05-03 22:32:31 +02:00
SpaceToad
5bde6b9dfc localize architect strings, close #1682 2014-05-03 22:30:16 +02:00
SpaceToad
fe64c95faa fixed save/load of facades, for #1679 2014-05-03 20:13:47 +02:00
SpaceToad
7b77008d97 Updated coding standard, and enforce it in the entire BuildCraft codebase. 
Close #1662.
 2014-05-03 18:59:52 +02:00
SpaceToad
f4a6d621e3 added facade tab back 2014-05-03 09:51:44 +02:00
Prototik
cb69f11cf9 Split creative tabs by blocks, items and pipes 2014-05-03 10:25:14 +08:00
SpaceToad
56699cf352 added support to throwing blocks in stripes pipe 2014-05-02 23:31:33 +02:00
SpaceToad
3b3100e9cf added potion support in stripe pipe, close #1675 2014-05-02 23:22:34 +02:00
SpaceToad
4d81b743d0 made code more clear, and implemented explicit support for blocks, fix #1668 2014-05-02 22:46:33 +02:00
SpaceToad
c355208be4 added missing rotation to the blueprint deployer, for #1671 2014-05-02 20:41:59 +02:00
SpaceToad
830ba84c87 added blueprint deployer, for #1673 2014-05-02 20:16:20 +02:00
SpaceToad
dd0bc3a41f fixed ignored items not clearing space, for #1671 2014-05-02 19:48:49 +02:00
SpaceToad
04bf86b06f removed final modifier to traveling item, close #1667 2014-05-02 19:38:44 +02:00
Prototik
1e927da66a Fix direction for dropped items 2014-05-03 01:04:22 +08:00
SpaceToad
9c48334c57 minor API cleanup 2014-05-02 09:07:08 +02:00
SpaceToad
5e3b0126ac implemented control over energy requirements, for #1664 2014-05-02 09:01:28 +02:00
SpaceToad
5bd9aec80a Implemented builder state save for filler and quarry. 
Fixed API, and moved out some non-essencial files.
Close #1618
 2014-05-01 23:40:30 +02:00
SpaceToad
f4ec1c6ca4 Increased price of stipe pipe. 
Removed redstone crystal, not yet used for recipes.
This is enough adjustements for #1564.
 2014-05-01 22:48:49 +02:00
SpaceToad
20f5746ae2 migrated remaining blocks to the new mj API, close #1578 2014-05-01 22:29:31 +02:00
SpaceToad
ae1003aaf7 extrated MjAPI from core 2014-05-01 19:34:01 +02:00
SpaceToad
86f129d889 Merge branch 'stripes-pipe' of https://github.com/Prototik/BuildCraft into Prototik-stripes-pipe 2014-05-01 16:51:42 +02:00
SpaceToad
1551d7c129 Implemented control in the architect, as not to read non-explicitely supported 
blocks.
Implemented blacklist for mods and blocks in builder.
Close #1594.
 2014-05-01 16:42:58 +02:00
Prototik
e3d731e5e1 More advanced stripes pipe. 
Manage fluids with buckets, cut leaves with shears and shot arrows.
 2014-05-01 22:13:41 +08:00
SpaceToad
f7d466c172 removed obsolete object default ids 2014-05-01 15:35:40 +02:00
SpaceToad
a9777c7d92 builders now clear unused power if idle too long, close #1587 2014-05-01 15:27:27 +02:00
SpaceToad
920be38a5f added building permissions, close #1509 2014-05-01 13:14:57 +02:00
SpaceToad
f38dc134c2 improved quarry algorithms, fix #1577 2014-05-01 11:55:16 +02:00
SpaceToad
31b578959d Introduced a third phase in blueprint building, fix #1659. 
Further refinements in builder processing.
 2014-05-01 10:43:51 +02:00
SpaceToad
2d2da9de6d Merge branch 'integration-table-triggers' of https://github.com/Prototik/BuildCraft into Prototik-integration-table-triggers 2014-05-01 10:07:17 +02:00
Prototik
f11d9bfff8 Add work-related triggers to integration table 2014-05-01 10:34:19 +08:00
Prototik
7fb185a12f Check an stack limit size for iron login pipes (fix #1395) 2014-05-01 09:47:56 +08:00
SpaceToad
e12df17804 re-added missing blocks to post-processing 2014-04-30 23:53:49 +02:00
SpaceToad
b752213a31 fixed post processing calls, fix #1656 2014-04-30 23:41:31 +02:00
SpaceToad
6364fc7a54 removed misleading sort functions 2014-04-30 21:23:33 +02:00
SpaceToad
931f22d5be minor reformat in block index and fix path builder loading, close #1655 2014-04-30 21:20:32 +02:00
SpaceToad
1ba976baff added provision for world bounds when building, fix #1652 2014-04-30 20:53:35 +02:00
SpaceToad
bdd646dbdd fixed behavior of redstone in blueprints, fix #1651 2014-04-30 20:44:21 +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
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
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
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
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