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

2473 commits

Author SHA1 Message Date
SpaceToad
1518ccdcf6 implemented connection between UI and board parameters, #1732 2014-06-07 16:10:18 +02:00
SpaceToad
1a74389a5c added additional random parameters for robot, #1732 2014-06-07 11:25:32 +02:00
SpaceToad
da32818bad Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-06 09:00:23 +02:00
SpaceToad
81bc0fe11b finalized recipe refactoring, close #1861 2014-06-06 09:00:11 +02:00
SpaceToad
05cf55b224 Merge pull request #1864 from Prototik/builder-fluid 
Fix builder fluid support
 2014-06-03 09:20:24 +02:00
SpaceToad
eda4d58c9e further fixes to the integration table, #1861 2014-06-03 09:00:43 +02:00
Prototik
27754198ac Fix fluid energy requirement 2014-06-03 11:07:49 +08:00
Prototik
091ae87333 Make Builder support fluids via containers/pipes 2014-06-02 23:33:03 +08:00
SpaceToad
ed1675ada5 fixes in the integration table, #1861 2014-06-02 17:20:35 +02:00
SpaceToad
a5b9a8870e fixed style errors 2014-06-02 16:34:05 +02:00
SpaceToad
cfb9095139 Initial refactoring of recipe mechanics. 
Assembly table should be ok, integration table and refinery still to go.
For #1851
 2014-06-02 16:29:13 +02:00
SpaceToad
fbf2cef772 Merge branch 'integration-table-advanced-recipe' of https://github.com/Prototik/BuildCraft into Prototik-integration-table-advanced-recipe 2014-06-01 15:17:22 +02:00
SpaceToad
5a2100804b Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-01 15:13:35 +02:00
SpaceToad
e193d634cf made progress in board parameters, #1732 2014-06-01 15:13:23 +02:00
Prototik
1c49dddf35 Advanced integration recipe 2014-06-01 18:35:35 +08:00
Raul Tambre
742391e504 Fix oil and fuel opacity 2014-06-01 10:48:31 +03:00
SpaceToad
6150c5b09e Merge branch '6.0.x' into 6.1.x 2014-05-31 18:09:33 +02:00
SpaceToad
8bff372360 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftBuilders.java
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/BuildCraftEnergy.java
	common/buildcraft/BuildCraftFactory.java
	common/buildcraft/BuildCraftSilicon.java
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/builders/network/PacketHandlerBuilders.java
	common/buildcraft/core/network/PacketHandler.java
	common/buildcraft/core/network/PacketTileState.java
	common/buildcraft/factory/network/PacketHandlerFactory.java
	common/buildcraft/silicon/network/PacketHandlerSilicon.java
	common/buildcraft/transport/network/PacketHandlerTransport.java
 2014-05-31 18:09:23 +02:00
SpaceToad
d946f8d936 tentative fix for packet leaks, #1855 2014-05-31 15:26:43 +02:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
7b20cab4be fixed style 2014-05-29 22:00:42 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
ce55fe5eb1 fixed redstone board writing, #1732 2014-05-29 15:07:18 +02:00
SpaceToad
d8d57e822f Merge branch '6.0.x' into 6.1.x 2014-05-29 14:17:29 +02:00
SpaceToad
b7a89c6cc8 Merge pull request #1856 from Prototik/inbt-serializable 
INBT serializable for @NetworkData
 2014-05-29 14:14:39 +02:00
SpaceToad
10e7429847 Merge pull request #1854 from Prototik/tile-marker-crash 
Fix tile marker crash
 2014-05-29 11:31:45 +02:00
SpaceToad
e7b680f29e made progress for robot implementation, #1732 2014-05-29 11:28:34 +02:00
Prototik
d3e3f8bf21 Add support for custom nbt-based serialize classes for @NetworkData 2014-05-28 14:16:40 +08:00
Prototik
173db45f4b Fix tile marker crash 2014-05-27 16:18:22 +08:00
Prototik
f9748a5bfc Fix pump crash 2014-05-27 11:52:44 +08:00
SpaceToad
e6ff3d7825 fixed style of previous check-in, #1732 2014-05-27 00:27:24 +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
34d285a448 started work on redstone boards, #1732 2014-05-26 09:34:28 +02:00
SpaceToad
e5e8e4da4b Merge branch '6.0.x' into 6.1.x 2014-05-25 17:54:28 +02:00
SpaceToad
111ad6032e Merge branch 'mjapi-engines' of https://github.com/Prototik/BuildCraft into Prototik-mjapi-engines 2014-05-25 17:48:03 +02:00
SpaceToad
972d39f678 fixed docking algorithms for robots, #1732 2014-05-25 17:47:36 +02:00
Prototik
0a4c84f558 Massive overhaul of energy system 2014-05-25 23:13:38 +08:00
SpaceToad
5060da651f progress with robot AI and fixed pathfinding, #1732 2014-05-25 17:08:53 +02:00
SpaceToad
79ddf23192 migrated robot picker to the new path resolver, #1732 2014-05-25 16:28:20 +02:00
Prototik
990c5bec91 Fix potential NPE in TileEnergyConverter 2014-05-25 18:08:54 +08:00
SpaceToad
3f46097772 fixed style 2014-05-24 21:15:47 +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
6280266024 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-05-24 13:37:27 +02:00
SpaceToad
4eb19a49b5 Merge branch '6.0.x' into 6.1.x 
Conflicts:
	common/buildcraft/transport/render/FacadeItemRenderer.java
 2014-05-24 13:36:45 +02:00
SpaceToad
ee1d7aeebc Merge pull request #1833 from Prototik/tank-drain 
Fix canFill/canDrain in tanks
 2014-05-24 00:26:54 +02:00
SpaceToad
8f8529d408 added handling of blueprints without unique ids, close #1842 2014-05-24 00:15:39 +02:00
viliml
82e804cd13 Update EntityRobotPicker.java 
Prevents a crash if the pipe a robot is docked onto is broken.
 2014-05-21 14:10:52 +02:00
Prototik
aa24a99d95 Fix canFill/canDrain in tanks 2014-05-21 13:29:17 +08:00
Prototik
5c4141970b Fix possible NPE in FacadeItemRenderer 2014-05-19 15:58:18 +08:00
SpaceToad
625b21719d Merge branch '6.0.x' into 6.1.x 2014-05-18 21:39:02 +02:00
SpaceToad
527cc7d6d4 do not send power where power is received, close #1827 2014-05-18 21:23:24 +02:00
SpaceToad
2eb8e868f2 tentative fix for #1826 2014-05-18 18:44:53 +02:00
SpaceToad
0f543e5228 progress in path finding algorithm 2014-05-18 18:04:29 +02:00
SpaceToad
48fe5076a3 fixed initial gate activation status 2014-05-18 17:23:46 +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
a68ffafc1c Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-18 17:00:43 +02:00
SpaceToad
13c8562fa1 Merge branch '6.0.x' into 6.1.x 2014-05-18 16:57:07 +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
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
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
fe1cbb3c63 fixes in the pathfinding system 2014-05-17 13:31:06 +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
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
SpaceToad
b2f8cf102d started to work on fixing pipes ids, for #1745 2014-05-09 19:41:51 +02:00
SpaceToad
7c6c9f67f3 fixed lamp being replaced if lit status is different, close #1735 2014-05-09 19:09:58 +02:00
Prototik
d16e0153cf Fix partial state info in AND gates 2014-05-10 01:04:14 +08:00
SpaceToad
4a0df69951 fixed style error 2014-05-09 18:19:50 +02:00
SpaceToad
25a99b2608 Merge branch '6.0.x' into 6.1.x 2014-05-09 18:19:00 +02:00
SpaceToad
515060fff3 Merge branch '6.0.x' into 6.1.x 2014-05-09 18:18:23 +02:00
SpaceToad
9ad662a6fa Merge pull request #1760 from Prototik/blueprints-stack 
Fix stacking of blueprints
 2014-05-09 18:14:33 +02:00
SpaceToad
8f75c80618 added provision against NPE 2014-05-09 18:13:15 +02:00
Prototik
bff5a6b348 Fix stackable blueprints 2014-05-09 22:57:23 +08:00
Prototik
bed9b59b0e Extract battery interface into IBatteryObject 2014-05-09 13:59:57 +08:00
SpaceToad
6ffd45f3d7 fixed style 2014-05-09 00:32:43 +02:00
SpaceToad
f91b9033fa Whitelisted to Applied Energetics spacial API all blocks that don't rely on 
absolute positions.
Close #1753
 2014-05-08 21:57:05 +02:00
SpaceToad
cf52bdaa45 Merge branch 'gate-and-ui' of https://github.com/Prototik/BuildCraft into Prototik-gate-and-ui 2014-05-08 18:22:03 +02:00
SpaceToad
f344a4aed2 Merge pull request #1748 from tambry/architectshiftclickfix 
Fix shift-clicking in architect table, fix #1740
 2014-05-08 18:20:48 +02:00
Prototik
7ca9e6987d Draw only half of indicator for AND gates when not all triggers active 2014-05-08 23:54:02 +08:00
Raul Tambre
27d095a00c Fix shift-clicking in architect table, fix #1740 2014-05-08 17:50:31 +03:00
Prototik
1c17929fa5 Drop blueprint if no space available in builder 2014-05-08 22:26:41 +08:00
SpaceToad
8ca978b0e1 Merge pull request #1744 from Prototik/builder-comparator 
Fix comparator requirements for builder
 2014-05-08 15:36:52 +02:00
SpaceToad
915b9e2baf Merge pull request #1743 from Prototik/builder-energy 
Fix read/write nbt in builders
 2014-05-08 15:35:42 +02:00
SpaceToad
3fcebdd40f Merge branch 'drop-stripes' of https://github.com/Prototik/BuildCraft into Prototik-drop-stripes 2014-05-08 15:30:54 +02:00
SpaceToad
c990c27ad2 only apply robot AI at next cycle 2014-05-08 15:28:23 +02:00
Prototik
31ac41aae6 Fix comparator requirements for builder 2014-05-08 20:25:33 +08:00
Prototik
fe2a5e6559 Fix read/write nbt in builders 2014-05-08 18:58:31 +08:00
Prototik
bfc6f02505 Fix server crash while drop items in stripes pipe too 2014-05-08 13:19:25 +08:00
Raul Tambre
2f7ae5a3f2 Disable/enable page buttons in blueprint library 2014-05-08 08:16:01 +03:00
SpaceToad
17b8a19eb1 removed deleted files 2014-05-08 00:28:27 +02:00
SpaceToad
0605b1d3f8 first attempts at using the regular AI framework, #1732 2014-05-08 00:27:46 +02:00
ninehous
990e07f8cd Update GuiBlueprintLibrary.java 
Fixed a formatting error.
 2014-05-07 23:09:54 +03:00
Raul Tambre
821ab3a9c3 Enable/disable delete button when selected or not 2014-05-07 21:35:13 +03:00
SpaceToad
646c694f80 removed redundant handling of custom items, for #1730 2014-05-07 20:11:19 +02:00
SpaceToad
4585c15e83 added double plant to the list of ignored blocks, close #1729 2014-05-07 20:07:42 +02:00
SpaceToad
f63a16bd95 removed useless override to slotClick 2014-05-07 19:58:21 +02:00
SpaceToad
83b526592d Reactivated robots, for #1732. 2014-05-07 19:48:39 +02:00
Raul Tambre
5781a9c01f In library set player even when shift clicked 
Was quite an annoying small bug.
Was trying to put some blueprints in blueprint library, but they well
wouldn't simply appear in the list.
Came out the uploading and downloading player is only set when the slot
is clicked.
 2014-05-07 20:29:11 +03:00
SpaceToad
2bbe4b132b fixed previous checkin 2014-05-07 11:57:55 +02:00
SpaceToad
de119ab52e fixed template soft block detection 2014-05-07 11:56:32 +02:00
SpaceToad
adb369c9c0 Merge branch 'Prototik-blueprints-downloads' into 6.0.x 2014-05-07 11:49:36 +02:00
SpaceToad
308bf078a9 Merge branch 'tables-actions' of https://github.com/Prototik/BuildCraft into Prototik-tables-actions 2014-05-07 11:44:02 +02:00
SpaceToad
6aab1f2346 Default download location is computed only once, as to make it more explicit 
to the user where things are located and how to fix.
 2014-05-07 11:26:28 +02:00
SpaceToad
41358a2f5f Merge branch 'blueprints-downloads' of https://github.com/Prototik/BuildCraft into Prototik-blueprints-downloads 2014-05-07 10:58:09 +02:00
Prototik
082794a7d2 Implement On/Off actions for the all tables 2014-05-07 16:15:37 +08:00
Prototik
d80ab96714 Using XDG for retrieving downloads dir on Linux/Mac. 2014-05-07 15:18:48 +08:00
undergroundminer3
ae06682617 Dont' break other mods' gui s when holding a pipe 
Restore the OpenGl to the state we found it,
instead of forcing the transparency to be turned off.
 2014-05-06 21:03:36 -04:00
SpaceToad
deee15abf9 slightly improved pipe drops behavior depending on speed 2014-05-06 23:24:39 +02:00
SpaceToad
d5786a3034 fixed style 2014-05-06 20:51:56 +02:00
SpaceToad
036a904617 Merge branch 'architecttabletextfield' of https://github.com/tambry/BuildCraft into tambry-architecttabletextfield 2014-05-06 20:50:23 +02:00
SpaceToad
6ae68757c7 Avoid using client-only setVelocity, but set it manually, close #1722. 2014-05-06 20:47:56 +02:00
SpaceToad
53ed55da8d Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-06 19:42:28 +02:00
SpaceToad
c21e3a2639 Merge branch 'blueprintlibraryslots' of https://github.com/tambry/BuildCraft into tambry-blueprintlibraryslots 2014-05-06 19:41:05 +02:00
SpaceToad
888da3081f Merge pull request #1720 from tambry/architecttablefocus 
On opening Architect GUI focus textfield
 2014-05-06 19:39:13 +02:00
Raul Tambre
b81cd59fb9 In architect GUI table allow key repeat events 2014-05-06 20:12:40 +03:00
Raul Tambre
c93d36acd6 On opening Architect GUI focus textfield 2014-05-06 20:02:57 +03:00
SpaceToad
5131374073 Added configuration for blueprint input / output folders. 
Changed default blueprint output folder.
Added capability of defining several blueprint input folders for the library.
Close #1717.
 2014-05-06 18:56:22 +02:00
Raul Tambre
48cb35c124 Make some blueprint library slots output slots 2014-05-06 19:50:53 +03:00
SpaceToad
962a8f7fbe Merge pull request #1715 from Prototik/update-messages 
Localize update messages
 2014-05-06 15:41:42 +02:00
Prototik
25774bbdf1 Change visibility for the things in TravelingItem 2014-05-06 21:25:29 +08:00
Prototik
93806cecca Localize update messages 2014-05-06 20:02:41 +08:00
SpaceToad
e0c7b8c573 Merge branch 'average' of https://github.com/Prototik/BuildCraft into Prototik-average 2014-05-06 11:20:51 +02: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
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