Commit graph

3022 commits

Author SHA1 Message Date
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
SpaceToad
89f71c515b Added to wood pipes the ability to interact with all BC energy APIs.
Close #1824
2014-05-18 15:55:19 +02:00
SpaceToad
9e4519ccf1 Fix potential exceptions, close #1815 2014-05-18 15:43:59 +02:00
SpaceToad
e2a85c1607 Intrusive rewrite of some power transmission mechanisms.
The new algorithm should be better at balancing power consumption between
sources.
For #1746
2014-05-18 15:31:56 +02:00
SpaceToad
9c0fdc61dc Merge pull request #1822 from Prototik/npe
Fix possible NPE
2014-05-18 12:27:38 +02:00
Prototik
bb3bf76bb4 Fix possible NPE and crashes 2014-05-18 17:02:24 +08:00
Prototik
3cfa2c5e14 Support for transparent facades 2014-05-18 16:38:52 +08:00
SpaceToad
631bdc0da9 Merge branch 'Prototik-advanced-phased-facades' into 6.1.x 2014-05-17 17:10:15 +02:00
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00
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
SpaceToad
5c0acc7b23 initiated a test framework 2014-05-17 13:31:18 +02:00
SpaceToad
fe1cbb3c63 fixes in the pathfinding system 2014-05-17 13:31:06 +02:00
SpaceToad
bd8f0e7235 Merge pull request #1813 from dmillerw/6.0.x
Various fixes for phased facades
2014-05-17 10:48:00 +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
c6c414ae43 added management of blocking blocks 2014-05-15 23:26:42 +02:00
SpaceToad
fc490f6d81 initial attempt at pathfinding algorithm 2014-05-15 23:25:49 +02: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
095350d2e4 started A* algoritm 2014-05-15 08:21:03 +02:00
SpaceToad
03fd7afb7f Merge branch '6.0.x' into 6.1.x 2014-05-14 17:45:05 +02:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +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
SpaceToad
1f21a80d70 Merge branch 'M3gaFr3ak-patch-1' into 6.0.x 2014-05-12 23:19:00 +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
b7e2a730df Merge pull request #1792 from Prototik/mjapi
Remove unnecessary extends for ISidedBatteryProvider interface
2014-05-12 12:27:10 +02:00
Prototik
3d120025e1 Remove unnecessary extends for ISidedBatteryProvider interface 2014-05-12 17:56:07 +08: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
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
030c8aa93d Merge pull request #1781 from Prototik/mjapi-iomode
Support for IO modes in MjAPI
2014-05-11 17:30:00 +02:00
Prototik
eeb3b16676 Support for IO modes in MjAPI 2014-05-11 23:22:57 +08: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
d584a18c44 Merge branch 'Humungus-6.1.flicker2' into 6.1.x 2014-05-11 16:34:26 +02:00