Commit graph

2154 commits

Author SHA1 Message Date
SpaceToad
04967c7c00 Merge branch '6.0.x' into 6.1.x 2014-05-17 14:17:50 +02:00
SpaceToad
30fbe3b614 fixed partial action state issues, close #1817 2014-05-17 14:17:29 +02:00
dmillerw
8a4b398285 Fixed checkstyle failure 2014-05-15 19:49:13 -07:00
dmillerw
0399c2c501 Fixed bad formatting 2014-05-15 19:41:13 -07:00
dmillerw
10efb94617 Removed debug item from creative menu 2014-05-15 19:38:03 -07:00
dmillerw
656baa987f Fixed phased facade having incorrect meta value 2014-05-15 19:37:43 -07:00
dmillerw
8b92fcfa88 Added localization for phased facade 2014-05-15 19:37:20 -07:00
SpaceToad
7e2365de26 Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-15 22:23:23 +02:00
SpaceToad
4b475d9fef fixed crash when removing prematurely removing blueprint from library, close #1812 2014-05-15 22:22:49 +02:00
SpaceToad
7e3a1d23e7 Merge pull request #1810 from Prototik/energy-converter
Make Converter block works with pipes
2014-05-15 20:07:36 +02:00
SpaceToad
c44842ad10 fixed deployer sequence, close #1811 2014-05-15 20:05:36 +02:00
Prototik
3a02c63ea6 Make Converter block works with pipes 2014-05-15 14:21:05 +08:00
SpaceToad
03fd7afb7f Merge branch '6.0.x' into 6.1.x 2014-05-14 17:45:05 +02:00
SpaceToad
bd846a59b7 fixed style errors 2014-05-13 21:17:42 +02:00
SpaceToad
fd6d98218e fixed previous check-in 2014-05-13 21:13:09 +02:00
SpaceToad
61cc4d5d61 updated Forge requirement 2014-05-13 21:12:26 +02:00
SpaceToad
02f7daf9a0 Fixed minor schematic registration.
Enabled additional standalone schematics.
Close #1794.
2014-05-13 21:03:19 +02:00
SpaceToad
7f6a0fec90 Fixed residual liquid in pumps, close #1790
Fixed residual liquid in refineries, close #1791
2014-05-13 20:47:00 +02:00
SpaceToad
424a976cd0 now uses Forge fake player, close #1786 2014-05-13 20:32:14 +02:00
SpaceToad
92adc79f21 added protection against exceptions, for #1786 2014-05-13 08:55:28 +02:00
SpaceToad
68205d0ca2 fixed handling of unbreakable blocks, #1789 2014-05-12 23:46:20 +02:00
Leon LoeseR
08edcf1759 Fix drain method causing dupe glitches...
...if using them mixed

Before the one accepting a FluidStack always returned null if the targeted tank was empty, but the one under it wasnt, the one w/ int doesnt have the problem.
2014-05-12 20:22:17 +02:00
SpaceToad
34e0bf9637 Last changes to the Builder API, renaming to enfore consistency and
improve maintainability.

Close #1785
2014-05-11 18:42:24 +02:00
SpaceToad
664ff00e7d removed unused field 2014-05-11 16:51:03 +02:00
SpaceToad
c96ff8666e Merge branch '6.0.x' into 6.1.x 2014-05-11 16:37:15 +02:00
SpaceToad
c17041ac17 Merge branch '6.0.x' into 6.1.x
Conflicts:
	common/buildcraft/BuildCraftTransport.java
2014-05-11 16:36:42 +02:00
SpaceToad
aa98f263ba Manually reset power when stipping a wire.
Fixed style errors.
Followup on #1776
2014-05-11 16:33:09 +02:00
undergroundminer3
394a6cc685 Forgot the import
Add the pipetype import
2014-05-11 10:18:43 -04:00
undergroundminer3
ecff97c2ef Don't crash when I create new PipeTypes
I am using reflection to "hack in" new PipeTypes for myself.
(Yes, that IS possible, but very "aggressive")

Don't cause an ArrayIndexOutOfBounds exception when I do that.
(at least when rendering, just don't place a gate on my pipes)

This is also another step towards
the ability to create new PipeTypes.
2014-05-11 10:10:08 -04:00
SpaceToad
986390babc fixed NPE in Box.extendToEncompass, close #1783 2014-05-11 14:31:38 +02:00
SpaceToad
1c90496cde Added protection around facade creation, fix #1780 2014-05-11 14:00:00 +02:00
SpaceToad
f1d9aee0b8 Added various levels of detection and recovery for missing blocks.
Such blueprints should not be loaded in survival, as there may be
inconsistencies, but it's ok to load in creative, in particular for repair if
needed.
Close #1779
2014-05-11 13:19:06 +02:00
SpaceToad
a7fe30f38a fixed schematic hanging 2014-05-11 12:54:05 +02:00
SpaceToad
bc1a7486cd Implemented heuristic for wider default id translation. Close #1778. 2014-05-11 11:51:17 +02:00
SpaceToad
4dcb9af871 added possibility to blacklist recipes, close #1750 2014-05-10 22:08:23 +02:00
Humungus
47fe7440d5 fixes in updating 2014-05-10 21:14:05 +02:00
Humungus
ed6499a1fa A simple fix for the wire flicker 2014-05-10 19:21:56 +02:00
SpaceToad
29d308f4f9 relax constraints when loading corrupted pipes 2014-05-10 17:29:18 +02:00
SpaceToad
262f2dc22a minor tweaks to liquid holding blocks, close #1769 2014-05-10 16:05:37 +02:00
SpaceToad
44e3aaa1c5 removed energy from engines in blueprints 2014-05-10 15:25:41 +02:00
SpaceToad
30e4d493b3 fixed engines orientation, for #1771 2014-05-10 15:24:22 +02:00
SpaceToad
577cf11257 minor fixes 2014-05-10 15:02:02 +02:00
SpaceToad
a29c0a1140 removed unused file 2014-05-10 13:43:30 +02:00
SpaceToad
98d2e2e2e6 Fixed issues with various schematics and their handling of item id translations.
The Schematic API has been updated to follow a pattern more explicit.
Part of #1745
2014-05-10 13:37:50 +02:00
SpaceToad
fb94d0f50c Merge branch 'sided-mjbattery' of https://github.com/Prototik/BuildCraft into Prototik-sided-mjbattery 2014-05-10 08:21:31 +02:00
Prototik
cb3b3d1fce Add support for sided batteries 2014-05-10 14:13:05 +08:00
SpaceToad
e18f01c784 Minor code reorganization to identify a unique block for legacy support. 2014-05-10 08:03:29 +02:00
SpaceToad
fba31fa057 Merge branch 'facades-5.0.x' of https://github.com/Prototik/BuildCraft into Prototik-facades-5.0.x 2014-05-10 07:59:09 +02:00
SpaceToad
684c695342 Merge pull request #1761 from Prototik/gate-and-ui
Fix partial state info glitches in AND gates
2014-05-10 07:41:46 +02:00
Prototik
12d321491e Add fallback facade loading for support migration from 5.0.x 2014-05-10 13:25:20 +08:00