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

568 commits

Author SHA1 Message Date
asiekierka
04fe3c31a7 BuildCraft 6.4.4 2015-03-22 00:34:34 +01:00
asiekierka
0a20b53c6d add RF power support to Auto Workbenches 2015-03-21 20:01:01 +01:00
asiekierka
bcb2a40fa5 make StatementParameterItemStacks override the description and output the item stack desc 2015-03-21 18:31:37 +01:00
asiekierka
ed76c9a4f1 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 
Conflicts:
	common/buildcraft/BuildCraftTransport.java
 2015-03-21 18:12:37 +01:00
asiekierka
69e9173a12 changes to robot accept/request behaviour 2015-03-21 18:11:22 +01:00
asiekierka
2186fbdd48 new features to stripes pipes 2015-03-21 11:20:07 +01:00
asiekierka
5cb7c9fe00 add stripes pipe direction control, add stripes handler priority system to API, add IBlueprintItem API thing 2015-03-20 17:03:46 +01:00
asiekierka
36ec39a59e improvements to Stripes Pipes 2015-03-20 15:07:12 +01:00
asiekierka
18add8b847 write global zone map system to replace earlier zone planner system 2015-03-19 22:01:52 +01:00
asiekierka
96492136c5 update 2015-03-17 08:24:14 +01:00
asiekierka
54088c2249 add assembly table, advanced crafting table and charging table models; improve pipe/gate speed further; add NEI support for gate recipes 2015-03-16 16:46:18 +01:00
asiekierka
470dfc0049 raise packet sending frequency, sync lang 2015-03-15 17:23:08 +01:00
asiekierka
082cda0653 update Essence, fix wrenches and non-rotatables, add glowing laser rendering, add paintbrushes 2015-03-14 17:03:20 +01:00
asiekierka
dd9c8fc84a blueprint library is now electronic library, can store books; add LibraryAPI 2015-03-13 14:27:22 +01:00
asiekierka
360047ed45 project essence, part 2 2015-03-13 09:27:06 +01:00
asiekierka
e3f28b5826 project essence, part 1 2015-03-11 22:07:02 +01:00
asiekierka
41ea53ecb6 update versions.txt 2015-03-10 08:13:10 +01:00
asiekierka
5541c8e7fd BuildCraft 6.4.3 2015-03-10 08:11:23 +01:00
asiekierka
07036941e5 made robot side light denote sleeping and energy level 2015-03-09 16:45:56 +01:00
asiekierka
4e6903547d massive resources refactor, add robot reserved/linkes/in station triggers 2015-03-09 13:59:13 +01:00
asiekierka
fe76b79d4e add debugger warning, improve pipe/robot debugging capabilities, fix lang 2015-03-07 13:26:23 +01:00
asiekierka
727c0e205b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-03-03 20:08:16 +01:00
asiekierka
883e8b479e fix changelog 2015-03-03 20:07:43 +01:00
asiekierka
dfa3f5f557 BuildCraft 6.4.2 2015-03-03 20:06:19 +01:00
asiekierka
d6dce9ee44 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-02-26 23:17:44 +01:00
asiekierka
9cd089bdc0 real BC 6.4.1, fix incorrect filler texture 2015-02-26 22:54:15 +01:00
asiekierka
9306baa0e8 BuildCraft 6.4.1 2015-02-26 22:49:15 +01:00
asiekierka
229f064e05 update license copyright year, fix #2470 2015-02-26 16:57:49 +01:00
asiekierka
bd2fa06063 add Programming Table 2015-02-24 14:39:23 +01:00
asiekierka
1f3a4ff2e6 BuildCraft 6.4.0 Beta 2015-02-22 22:35:22 +01:00
asiekierka
2389f1e67b BuildCraft 6.3.7 2015-02-22 09:03:05 +01:00
Hea3veN
09b004e790 add a stripes robot 2015-02-19 21:10:11 -03:00
Hea3veN
6fe8ec37db add a gate action to filter the tools of the robots 2015-02-17 18:10:26 -03:00
asiekierka
20313b1e7f BuildCraft 6.3.6 - hotfix 2015-02-06 20:19:31 +01:00
asiekierka
86974d071e fix changelog 2015-02-06 19:56:20 +01:00
asiekierka
0dd57e7f27 BuildCraft 6.3.5 2015-02-06 19:39:24 +01:00
Arona Jones
671d964f33 Fix #2426 and #2408. Partially Fix #2345. 2015-02-03 07:21:02 +00:00
asiekierka
5771b6b9e7 BuildCraft 6.3.4, fix #2423 and #2419 2015-01-31 00:42:54 +01:00
asiekierka
3fca102985 BuildCraft 6.3.3 2015-01-23 09:18:07 +01:00
asiekierka
f8ae10e2f2 BuildCraft 6.3.2 2015-01-22 23:37:52 +01:00
asiekierka
3be7ce1189 extend power number hiding to iron power pipes and creative engines 2015-01-18 11:06:18 +01:00
asiekierka
7eaf537ecf the real BuildCraft 6.3.1 - make pluggables easier to remove, make pluggables pop directly into your inventory when removed 2015-01-10 18:42:55 +01:00
asiekierka
dd2e3ab3e9 BuildCraft 6.3.1 2015-01-10 17:31:33 +01:00
asiekierka
bfa726e928 BuildCraft 6.3.0 2015-01-06 15:20:28 +01:00
asiekierka
368eda1251 add quartz gates, scrollwheel support in gate and zone planner interfaces, add proper pipe wire bounds checking to wire parameters 2015-01-03 22:38:16 +01:00
asiekierka
8fba5bb6a1 change filter texture, fix lens recipe, add filter recipe, fix NPE in ColorUtils 2014-12-28 22:31:59 +01:00
asiekierka
90c551774e add gate recipe cost multiplier, add missing filter localization name, temporaily disable power adapters 2014-12-24 15:08:17 +01:00
asiekierka
e69b876434 update resources 2014-12-21 21:22:05 +01:00
ganymedes01
b783cf6b5c Gates and wires now glow in the dark when active 
Note: Some texture re-work might be necessary... I think the current
lit texture are far too bright.

Found a bug: popping a gate out of the pipe doesn't update it on the
client side (a.k.a. the gate pops out but is still rendered on the pipe)
 2014-12-19 16:19:23 -02:00
asiekierka
bbf178e48f fix PipeEventBus, add filters, fix liquid QDS from HQM not connecting (apparently not everything has FluidTankInfo) 2014-12-18 23:37:33 +01:00
asiekierka
bdc920bef8 add lens rendering 2014-12-17 16:36:03 +01:00
asiekierka
e4c79f44af add lenses (no renderer yet), optimize some packets 2014-12-17 16:19:03 +01:00
asiekierka
bd52ca6981 Merge branch '6.2.x' of github.com:BuildCraft/BuildCraft into 6.3.x 2014-12-15 17:32:24 +01:00
asiekierka
ddf4c717df fix versions.txt 2014-12-14 23:00:09 +01:00
asiekierka
87fffc2456 BuildCraft 6.2.5 2014-12-14 17:03:02 +01:00
ganymedes01
a6e9c4865d Made robot lights shiny 2014-12-14 16:30:32 +01:00
asiekierka
da923944de sync 2014-12-13 14:12:13 +01:00
asiekierka
883de2d8bb fix #2298, add list tooltips, fix inserting lists inside lists, fix list stackability 2014-12-13 10:20:44 +01:00
asiekierka
01ad2501c9 BC 6.2.4, fix #2290 2014-12-10 23:41:55 +01:00
ganymedes01
4f61b5998a Made robot lights shiny 2014-12-10 18:29:58 -02:00
asiekierka
2538c3457c BuildCraft 6.2.3 2014-12-10 20:50:38 +01:00
asiekierka
63b1703e4e BuildCraft 6.2.2 2014-12-01 22:10:37 +01:00
asiekierka
a7f087f598 remove BlockMultiTexture 2014-11-30 10:42:54 +01:00
asiekierka
5dcbf56c16 BuildCraft 6.2.1 2014-11-30 00:32:28 +01:00
asiekierka
b76846e971 unnerf Mining Wells, add shift-hover pipe tooltips, etc. 2014-11-28 18:35:25 +01:00
asiekierka
9bf2a15ca5 BuildCraft 6.2.0 2014-11-27 20:25:34 +01:00
asiekierka
2dec0b2475 remove old pre-1.5 textures 2014-11-23 15:09:12 +01:00
asiekierka
9f36946910 optimize all PNGs with optipng 2014-11-23 15:06:05 +01:00
asiekierka
3437d57818 add resources for overheat gate, move redstone actions to their respective classes (for #1891) 2014-11-23 15:00:22 +01:00
asiekierka
60ec37ee38 remove science book textures 2014-11-16 13:57:38 +01:00
asiekierka
b299537a13 emerald fluid pipes can now filter the liquid 2014-11-16 13:56:26 +01:00
Adrian Siekierka
82391bf728 add diamond liquid pipes 2014-11-13 18:07:03 +01:00
Adrian Siekierka
70396e7e24 begin work on Diamond Liquid Pipes 2014-11-13 14:39:37 +01:00
Adrian Siekierka
58ee6f2df4 Clay Insertion Pipes, add translations for clay transport/sandstone power pipes 2014-11-12 17:07:35 +01:00
Adrian Siekierka
051036848a Merge remote-tracking branch 'origin' into 6.2.x 2014-11-10 21:04:59 +01:00
Adrian Siekierka
b93b1d0d1a BuildCraft 6.1.8 2014-11-10 21:04:50 +01:00
Adrian Siekierka
dc59ce156f Merge remote-tracking branch 'origin' into 6.2.x 2014-11-09 16:04:34 +01:00
Adrian Siekierka
f180038bfd add/fix translations 2014-11-09 16:04:09 +01:00
Adrian Siekierka
b78bf28ead fix GUI offsets and textures, finish charging table 2014-11-08 10:31:47 +01:00
Adrian Siekierka
0fc902c3b7 update changelog 2014-11-07 19:17:27 +01:00
asiekierka
ffb659bc7c update changelog, version info 2014-11-02 08:24:53 +01:00
asiekierka
6813d9882f touch-ups: fix lang typo, fix tooltip delay in zone planner 2014-11-02 08:12:22 +01:00
asiekierka
f17f0cc9d7 touchups: requester/zone planner recipes, tooltip/GUI improvements, adding missing langnames 2014-11-02 08:06:36 +01:00
asiekierka
ad25b17c6e builders now only send packets to GUI watchers 2014-11-02 07:36:33 +01:00
asiekierka
f190377014 add gatesideonly icon, make Redstone Output use localizations, update en_US.lang 2014-10-26 17:58:59 +01:00
asiekierka
0fe11813e8 make gate copiers use raytracing and not naive sides, add textures and recipes 2014-10-26 08:57:49 +01:00
asiekierka
fd370955bd add gate verification post-copy, fix minor update bug 2014-10-26 07:32:12 +01:00
asiekierka
fe64c3e39b clean up resources, add missing emerald gate tooltip 2014-10-24 16:06:20 +02:00
asiekierka
e5dccdc229 recompress all textures with pngout, move texture masters to misc 2014-10-18 10:17:57 +02:00
asiekierka
c3a12170c7 update localization - fix misspelling and add boards tab 2014-10-15 18:24:10 +02:00
SpaceToad
d67b916ab9 Merge pull request #2011 from RufusStark/6.1.x 
Quartz Fluid Pipe and Flow Rate Multiplier
 2014-09-09 07:15:07 +01:00
RufusStark
7a436c5a31 ActionValve and ActionParameterDirection 2014-09-08 21:41:48 -05:00
SpaceToad
fd928abbfc added missing construction mark name 2014-09-07 13:04:39 +02:00
SpaceToad
579252a473 Further progress on composite blueprints (#1544). 
Markers now display if they're recording a composition or not.
Architects save / load their sub-blueprints.
Composition links have a maximum reach.
 2014-09-07 11:52:15 +02:00
RufusStark
2f17a302e7 Merge remote-tracking branch 'upstream/6.1.x' into 6.1.x 2014-09-06 20:06:52 -05:00
SpaceToad
416180819b improved laser rendering for composite architects, #1544 2014-09-06 18:51:49 +02:00
SpaceToad
0381a4edd0 Merge branch '6.0.x' into 6.1.x 
Conflicts:
	build.gradle
	common/buildcraft/transport/render/FacadeItemRenderer.java
 2014-09-06 12:32:59 +02:00
asiekierka
13dcc7841d Forgot to push fixed lang file 2014-09-04 20:06:47 +02:00
asiekierka
3f81bb3262 Emerald Kinesis Pipe 2014-09-04 13:07:37 +02:00
SpaceToad
1c23818474 prepare version 6.0.18 2014-09-02 21:22:58 +02:00
RufusStark
35ef452017 add Quartz Fluid Pipe (20mb/t) 2014-09-01 01:18:31 -05:00
SpaceToad
1dc5d83ea2 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-08-29 00:03:19 +02:00
SpaceToad
72758ba9a9 implemented list item, close #1999 2014-08-29 00:03:05 +02:00
SpaceToad
f9b769bdde Implemented pump robot, close #1985. 
Fixed race conditions with robot registry.
 2014-08-18 23:32:11 +02:00
SpaceToad
2d6e0a2c59 added 6.1.1 changelog 2014-08-17 17:43:41 +02:00
SpaceToad
73198c4a7b Implemented filters for crafting robots. 
Crafting robots now only answers to stack requests.
 2014-08-17 11:37:30 +02:00
SpaceToad
2c69299172 finish first implementation of fluid transporter, #1985 2014-08-16 18:03:20 +02:00
SpaceToad
bebd14a9dd started work on fluid-related robots, for #1985 2014-08-15 17:19:30 +02:00
SpaceToad
1bd39d326a implemented delivery robot, for #1984 2014-08-15 10:55:28 +02:00
SpaceToad
3b9b1af204 further work in requesting orders, for #1973 2014-08-14 23:24:53 +02:00
SpaceToad
221a4416e5 implemented stack requesting mechanism, for #1973 2014-08-14 18:58:17 +02:00
SpaceToad
a2871a566a Merge branch '6.0.x' into 6.1.x 
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
 2014-08-05 08:57:14 +02:00
SpaceToad
9ceaabfead started work on crafting robot and related blocks, for #1973 2014-08-05 08:55:45 +02:00
SpaceToad
d2592b3f89 added changelog for 6.1.0 2014-08-03 14:00:43 +02:00
SpaceToad
0e408c5538 made progress for science book, for #1951 2014-08-03 11:38:35 +02:00
Mitchell
0106f11648 Update en_US.lang 
Fix one more small grammar error
 2014-08-02 21:22:50 -03:00
Mitchell
206f31848a Update en_US.lang 
Fix Grammar Mistakes
 2014-07-31 15:07:51 -03:00
SpaceToad
420fee4d34 added missing changelog 2014-07-29 08:54:22 +02:00
SpaceToad
48d95b1e26 made progress with research book, for #1951 2014-07-27 23:05:35 +02:00
SpaceToad
d10c570466 start work on science book 2014-07-25 08:40:47 +02:00
SpaceToad
1e04358334 Generalized packet slicing. 
Added texture for zone planner.
 2014-07-21 17:45:59 +02:00
SpaceToad
e155b9b761 robots can now work on a zone defined from a map 2014-07-21 14:34:21 +02:00
SpaceToad
b117a23c5d added multi-area selection capabilities 2014-07-20 23:41:43 +02:00
SpaceToad
bb72ff14ec Merge branch '6.0.x' into 6.1.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:33:53 +02:00
SpaceToad
6ac6ea4734 prepare release 6.0.17 for Minecraft 1.7.10 2014-07-11 23:57:44 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +02:00
SpaceToad
4c731c533c started work on builder robot, for #1908 2014-07-06 16:59:37 +02:00
SpaceToad
1153dd3c9f started library of default blueprints 2014-07-06 16:52:37 +02:00
SpaceToad
2bb67431b8 added new triggers for energy request and storage detection, close #1897 2014-07-04 19:34:40 +02:00
SpaceToad
66ae784ed0 bucher -> butcher, close #1926 2014-07-04 09:03:24 +02:00
SpaceToad
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
43e1e6d8c0 implemented filter for block breaking robots, for #1922 2014-06-30 09:14:30 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
d38ab37cc0 added missing captions 2014-06-28 18:14:31 +02:00
SpaceToad
bb3618aaf9 Further work in robot carrier control. 
Items can now be filtered.
It's now possible to put items in a pipe.
For #1877.
 2014-06-28 17:15:34 +02:00
SpaceToad
f61c3cacaa added station robot forbid, for #1877 2014-06-28 00:31:00 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00
SpaceToad
3c409ca0b9 started work on bomber, for #1913 2014-06-26 08:51:28 +02:00
SpaceToad
3d9a2ee9de first version of knight robot, close #1911 2014-06-26 00:20:57 +02:00
SpaceToad
dfc759de6c Started work on carrier robot, for #1907. 2014-06-24 07:32:50 +02:00
SpaceToad
4428b44674 Started work on actions to provide / request items, for #1877. 2014-06-22 17:09:25 +02:00
SpaceToad
c3f5e44565 implemented close pipe action, close #1902 2014-06-22 15:03:16 +02:00
SpaceToad
ac28a810aa fixed triggers and actions transparency 2014-06-15 19:46:33 +02:00
SpaceToad
254a533060 Allows to mark areas and path on top of specific locations. 
Generalization of #1882
 2014-06-15 03:28:35 +02:00
SpaceToad
44d4e4e3b9 started work on docking action, #1877 2014-06-15 02:41:00 +02:00
SpaceToad
31cc8b6438 removed unused texture 2014-06-15 00:17:54 +02:00
SpaceToad
2aa1530444 prepare icons for robot triggers / actions, #1877 2014-06-15 00:16:58 +02:00
SpaceToad
0ca64b0798 implemented a location recording, close #1882 2014-06-14 17:55:53 +02:00
SpaceToad
70c1cd0535 Started a major refactor of the trigger action system. 
Triggers and actions are moving towards more factorization in statements.
Actions will now accept parameters.
Triggers and actions will accept up to 3 parameters.
Parameters will not only be stacks, in particular for pipe wire.
This is supporting in particular the emerald gate implementation, for #1880.
 2014-06-13 13:15:33 +02:00
SpaceToad
101f591f8f Implemented leave cutter, close #1876 2014-06-12 18:29:02 +02:00
SpaceToad
6389baa9cb Implemented planter robot, close #1874. 2014-06-12 13:46:52 +02:00
SpaceToad
00521143b6 Merge branch '6.0.x' into 6.1.x 2014-06-07 18:57:09 +02:00
SpaceToad
92bfbe4e27 added missing lang properties 2014-06-07 18:56:38 +02:00
SpaceToad
1a74389a5c added additional random parameters for robot, #1732 2014-06-07 11:25:32 +02:00
Prototik
6eec57c35f Fix transparent facade item texture 2014-06-03 10:50:20 +08:00
Prototik
091ae87333 Make Builder support fluids via containers/pipes 2014-06-02 23:33:03 +08:00
SpaceToad
02e8ef057e removed unused files and graphic components 2014-06-01 15:16:39 +02:00
SpaceToad
e193d634cf made progress in board parameters, #1732 2014-06-01 15:13:23 +02:00
SpaceToad
7898637b33 prepare version 6.0.16 2014-05-31 18:16:42 +02:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
7acb8b4592 made progress with robot recipes and boards, #1732 2014-05-27 00:25:39 +02:00
SpaceToad
379ea6e278 fixed style and removed unused files 2014-05-26 23:00:01 +02:00
SpaceToad
5046cc445b added missing icons, #1732 2014-05-26 09:35:10 +02:00
SpaceToad
34d285a448 started work on redstone boards, #1732 2014-05-26 09:34:28 +02:00
SpaceToad
e9b84c7121 made progress for implementation of testing framework, #1846 2014-05-24 21:05:23 +02:00
SpaceToad
c23a5573f4 Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-24 13:37:44 +02:00
SpaceToad
8039dacff8 started to work on tester item 2014-05-24 13:35:22 +02:00
SpaceToad
625b21719d Merge branch '6.0.x' into 6.1.x 2014-05-18 21:39:02 +02:00
SpaceToad
6c4dbb4297 prepare hotfix 6.0.15 2014-05-18 21:29:59 +02:00
SpaceToad
77708e8bff Merge branch 'transparent-facades' of https://github.com/Prototik/BuildCraft into Prototik-transparent-facades 2014-05-18 17:04:52 +02:00
SpaceToad
13c8562fa1 Merge branch '6.0.x' into 6.1.x 2014-05-18 16:57:07 +02:00
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
Prototik
3cfa2c5e14 Support for transparent facades 2014-05-18 16:38:52 +08:00
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00
dmillerw
8b92fcfa88 Added localization for phased facade 2014-05-15 19:37:20 -07:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +02:00
SpaceToad
9dec031449 fixed spelling mistake 2014-05-11 19:53:18 +02:00
SpaceToad
af402df7f9 prepare 6.0.12 release 2014-05-11 18:47:48 +02:00
SpaceToad
1fc3890b96 prepare 6.0.11 release 2014-05-10 23:51:41 +02:00
SpaceToad
49747b054e Minimal texture change, derived from #1773, close #1207. 2014-05-10 17:08:17 +02:00
SpaceToad
492b2805bf prepare 6.0.10 release 2014-05-06 23:34:58 +02:00
SpaceToad
3e4378f565 added back old architecture textures, close #1718 2014-05-06 17:42:58 +02:00
Prototik
93806cecca Localize update messages 2014-05-06 20:02:41 +08:00
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
SpaceToad
21fd683e58 Re-activated version check and changelog extracting, now based on github files. 
Close #1709
 2014-05-05 23:54:23 +02:00
SpaceToad
fe5e734b64 Added provision for blueprints with non existing blocks and entities. 
Close #1702
 2014-05-05 17:01:48 +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
c2341c4aaa Merge branch '5.0.x' into 6.0.x 2014-05-04 12:21:27 +02:00
SandGrainOne
ad7587785d Corrected wire tooltip in gates 2014-05-04 02:33:28 +02:00
SpaceToad
5bde6b9dfc localize architect strings, close #1682 2014-05-03 22:30:16 +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
920be38a5f added building permissions, close #1509 2014-05-01 13:14:57 +02:00
dmillerw
ecfb6e8ca4 Added phased facades 2014-04-27 16:07:46 -07: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
TXX59
1ab8cd96f9 Change back to Stirling Engine as requested by ST. 2014-04-16 21:07:44 +01: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