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

3012 commits

Author SHA1 Message Date
asiekierka
42f6d298ee refactor stripes pipes, create early version of stripes pipe API, for #1670 2014-10-22 16:30:53 +02:00
asiekierka
559387ba38 fix checkStyle 2014-10-22 11:13:33 +02:00
asiekierka
dcb138bba3 rewrite redstone engines, certain pipes among others; start work on #2075 2014-10-22 11:04:12 +02:00
asiekierka
8e025fede5 logging should have been using BCLog, not Logger; run automated cleanup on source code 2014-10-22 06:30:05 +02:00
asiekierka
5a4635876c improve engine mechanics and fix orientation bugs 2014-10-22 06:25:18 +02:00
Adrian Siekierka
582ebb9887 Merge pull request #2072 from adudney/LightOptimizations 
Optimized power transport pipes a bit
 2014-10-22 06:20:11 +02:00
Andrew Dudney
55ae375dd2 Changed Math.min call to outside the loop so as to split power evenly between inputs when more energy is requested than can be output 2014-10-21 16:34:00 -06:00
Andrew Dudney
5923e2333c Optimized power transport pipes a bit 2014-10-21 16:26:46 -06:00
asiekierka
7bc31deb52 add further invalid IMC checks and logging for #2071 2014-10-21 16:26:14 +02:00
asiekierka
f30b370870 fix #2071 2014-10-21 12:04:45 +02:00
asiekierka
007390617c use IEnergyConnection instead of IEnergyHandler 2014-10-21 10:48:45 +02:00
Adrian Siekierka
6755db397b Merge pull request #2070 from adudney/NameRemappingMark2 
Fixed Laser remapping (again) and gave buildToolBlock a name
 2014-10-21 09:03:15 +02:00
Andrew Dudney
9e291e9bd3 Check style 2014-10-20 18:14:54 -06:00
Andrew Dudney
997a2eb98e Fixed Laser remapping (again) and added buildToolBlock name so that there are no more null names (That's the thing that the builder/filler uses to show the red flying breaker block) 2014-10-20 18:06:57 -06:00
Andrew Dudney
dabb9946e1 Stopped wooden pipes from extracting from IEnergySources, it seems to be unnecessary 2014-10-20 15:59:05 -06:00
asiekierka
0b4ec5b84b optimize chutes further 2014-10-20 16:23:12 +02:00
asiekierka
b9657e8bbc optimize quarry and chute tile entity lookups 2014-10-20 16:16:18 +02:00
asiekierka
10b224b21c fix style 2014-10-20 12:38:26 +02:00
asiekierka
e4bf8981d7 minor fixes, including valve behaviour changes to make more sense 2014-10-20 10:41:50 +02:00
Andrew Dudney
72df99713b Fixed laser remapping 2014-10-19 16:09:49 -06:00
asiekierka
b512beb449 fix style 2014-10-19 21:53:19 +02:00
asiekierka
2374bd1526 fix #1901 and #2061 2014-10-19 21:04:02 +02:00
asiekierka
061a07192e fix silicon laser table remapping 2014-10-19 19:53:45 +02:00
asiekierka
ec846a4e46 fix #2062 2014-10-19 19:48:13 +02:00
asiekierka
554ac2a636 clean up buildcraft.energy, for #2045 2014-10-19 14:42:58 +02:00
asiekierka
32a9d625d8 Finish cleaning up Silicon and Transport, for #2045 2014-10-19 14:36:27 +02:00
asiekierka
260a57d600 create IFacadeItem API, close #1946 2014-10-19 12:21:45 +02:00
asiekierka
88351a6bd8 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-19 11:00:11 +02:00
asiekierka
3706cc3148 fix #2043 2014-10-19 11:00:01 +02:00
Adrian Siekierka
5df3d14370 Merge pull request #2059 from AEnterprise/6.1.x 
fix laserTables being mapped as "null" and remap them
 2014-10-19 10:25:00 +02:00
AEnterprise
eac078658c fix style 2014-10-19 10:24:27 +02:00
asiekierka
9686830173 fix style 2014-10-19 10:20:17 +02:00
AEnterprise
ba8608f7aa fix laserTables being mapped as "null" and remap them 2014-10-19 10:18:23 +02:00
asiekierka
5f5b95dd9a fix #2056 2014-10-19 08:12:25 +02:00
Adrian Siekierka
0e8b64ab76 Merge pull request #2052 from adudney/6.1.x 
Fixes engines storing energy for all time when unpowered
 2014-10-19 08:02:43 +02:00
Adrian Siekierka
12e2cb0574 Merge pull request #2054 from adudney/RedstoneEngine 
Fixed redstone engines being 1/10th as effective as they should be
 2014-10-19 08:02:07 +02:00
Andrew Dudney
652b28d57a Fixed engines not switching to continuous power if the orientation they were in was valid to begin with 2014-10-18 21:32:52 -06:00
Andrew Dudney
35d1def0b2 Fixed Wooden Item Pipe extracing items for 1/10th the energy it should use. 2014-10-18 20:44:47 -06:00
Andrew Dudney
b5c2129706 Fixed redstone engines being 1/10th as effective as they should be 2014-10-18 20:38:41 -06:00
Andrew Dudney
59f0b5e412 Added call to super.updateEngine in the combustion tile, disabled generation of energy when redstone is off for the stirling tile. 2014-10-18 17:18:07 -06:00
asiekierka
4c4f679f55 remove useless TileEngineLegacy class 2014-10-19 00:08:39 +02:00
asiekierka
593a5a5c07 remove redundant code from #2051 2014-10-18 23:49:08 +02:00
Andrew Dudney
d691d72bcc Fixed stone engine heat mechanics 2014-10-18 14:05:14 -06:00
asiekierka
32f7dbe0dc Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-18 19:16:36 +02:00
asiekierka
c961de9daf fix a lot of engine code, close #2048 2014-10-18 19:16:22 +02:00
Adrian Siekierka
b3eeef39e3 Merge pull request #1992 from kremkrem/6.1.x 
fixed door schematic saving, for #1962
 2014-10-18 16:32:12 +02:00
asiekierka
777fee2092 fix style 2014-10-18 16:23:47 +02:00
asiekierka
e5904e0316 BuildCraft 6.1.2 2014-10-18 15:45:43 +02:00
asiekierka
57e8829266 further work on #2045 2014-10-18 15:26:23 +02:00
asiekierka
24a02a5b17 begin moving things between Core and Builders for #2045 - Factory should now only depend on Core 2014-10-18 14:20:06 +02:00
asiekierka
257c49f4f9 fix valves for power and add omnidirectional valves with no parameter, closes #2019 2014-10-18 09:44:04 +02:00
asiekierka
3c41186609 make BuildCraft log warnings more consistent and improve their spelling quality 2014-10-18 09:14:54 +02:00
asiekierka
b3e908d1ac cleanup, add recipe removal APIs and IMC messages 2014-10-18 09:11:08 +02:00
asiekierka
c04224d466 add BuildCraftCompat hooks 2014-10-16 10:41:55 +02:00
asiekierka
b5710e826e fix style 2014-10-15 18:49:17 +02:00
asiekierka
549cbd5219 clean up engine and fuel code to fully use RF 2014-10-15 18:45:16 +02:00
asiekierka
06ab6e09c6 fix ILaserTarget deprecation and add ILaserTargetBlock as a major optimization for laser lookups, closes #2027 2014-10-15 18:20:37 +02:00
asiekierka
249caf7e21 fix wooden kinesis pipes not taking energy from certain RF generators unless they already had energy in them 2014-10-15 18:13:21 +02:00
asiekierka
0db1a4cbe3 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-15 17:44:12 +02:00
asiekierka
455436c87c fix #2034 2014-10-15 17:43:28 +02:00
Adrian Siekierka
47fa82e169 Merge pull request #2032 from marcin212/patch-1 
fixed NPE in WorldProperty
 2014-10-15 17:40:24 +02:00
asiekierka
f49b04da37 Fix facade recipe desynchronization on client and server. Closes #2042 
This bug was caused by tterrag's pull request having a hasNoNullIcons
function, which returned false on the server side, not letting any
facade recipe through. The new approach relies on replacing non-existant
textures with a transparent oeeN
 2014-10-15 15:51:57 +02:00
asiekierka
3f752cca4b Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-15 15:41:19 +02:00
Tyson Brown
a698f56719 Fixed incorrect chunk positions in SpringPopulate and OilPopulate. 2014-10-08 13:15:36 -04:00
marcin212
b819ad4c3f fixed NPE in WorldProperty 
probably fix: https://gist.github.com/marcin212/8e73b41a6269f0825d03
 2014-10-01 15:44:34 +02:00
AEnterprise
84c6b57ae5 fix robot event 2014-09-20 11:52:18 +02:00
AEnterprise
8d6dc8c29b fix merge conflict 2014-09-20 11:46:31 +02:00
SpaceToad
51075b886c Merge pull request #2024 from AEnterprise/6.1.x 
add event to detect and prevent the placement of robots
 2014-09-20 10:40:00 +01:00
AEnterprise
6ee4b2de2e fix style and coppyright notices 2014-09-20 11:30:33 +02:00
ShetiPhian
1dfd5479e5 Set toolClass of ItemWrench to "wrench" 
Allows other mods to use the BuildCraft wrench (for things other then rotation) without needing to know the itemstack or implementing the API.
 2014-09-19 22:20:23 -04:00
AEnterprise
daff831569 make markers and builder send BC block placement events 2014-09-19 16:05:02 +02:00
AEnterprise
9330dd18d9 also need coordinates for the pipe placement location 2014-09-18 17:25:28 +02:00
AEnterprise
fb706ae1ab detect interaction with pipes (for gates, plugs and robot stations) 2014-09-17 18:13:00 +02:00
AEnterprise
b01533e1d5 make it possible to differenciate between the lasertables and engines 2014-09-17 15:41:45 +02:00
AEnterprise
cdc7ea054b filtered buffer wasn't sending blockInteraction event 2014-09-17 13:41:27 +02:00
AEnterprise
21a5f00199 somehow the old import didn't get removed 2014-09-16 21:32:41 +02:00
AEnterprise
d3d6f88a1c make refinery extend BlockBuildcraft 2014-09-16 21:20:42 +02:00
AEnterprise
78091876ad fix mining well not calling super when placed down 2014-09-16 21:07:37 +02:00
AEnterprise
e28a74b771 make blockTank extend BlockBuildcraft 2014-09-16 20:35:05 +02:00
AEnterprise
0c11181e85 add event to detect and prevent the placement of robots 2014-09-16 17:39:18 +02:00
SpaceToad
857b0c42ca Merge pull request #2022 from ChatFawkes/patch-1 
Change tooltips to use RF instead of MJ
 2014-09-15 18:25:03 +01:00
SpaceToad
97f1b11ce1 Merge pull request #2023 from AEnterprise/6.1.x 
fix game crashing when placing robot without a redstone board installed
 2014-09-15 18:21:43 +01:00
AEnterprise
df1cf3c6d1 fix style (again) 2014-09-15 08:44:45 +02:00
AEnterprise
e78fc8a778 fix game crashing when placing robot without a redstone board installed 2014-09-15 08:33:45 +02:00
ChatFawkes
4af697a5e6 Change tooltips to use RF instead of MJ 2014-09-15 00:59:00 -04:00
SpaceToad
446bf4454b fixed quarry pumping out frames, close #1941 2014-09-15 00:44:57 +02:00
SpaceToad
1d9dcd6ae2 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-09-14 20:53:06 +02:00
SpaceToad
1ec9d92699 added variable timeout for schematic, down to 1. close #1971 2014-09-14 20:52:53 +02:00
SpaceToad
9fc636d272 Merge pull request #2020 from AEnterprise/6.1.x 
fix progressbar in the lasertables
 2014-09-14 16:46:35 +01:00
AEnterprise
dec9be8f51 fix progressbar in the lasertables 2014-09-14 17:44:15 +02:00
SpaceToad
2c5c282f2f fixed potential integer overflow 2014-09-14 17:30:45 +02:00
SpaceToad
3d3085dd06 fixed precision loss in average computation, close #2016 2014-09-14 17:28:14 +02:00
SpaceToad
69ff44dc9f Fixed wood pipe accepting energy from other pipes, following RF migration. 
Part of #2016.
 2014-09-14 16:59:07 +02:00
SpaceToad
2e76b90191 Merge pull request #2018 from AEnterprise/6.1.x 
fix MJ->RF migration with blocks that where already in the world
 2014-09-14 15:25:34 +01:00
AEnterprise
aab946140b fix style, remove unnecesairy check 2014-09-14 16:18:57 +02:00
AEnterprise
5e526416c4 fix MJ->RF migration with blocks that where already in the world 2014-09-14 15:58:37 +02:00
SpaceToad
fca62af54b fixed style 2014-09-14 15:44:38 +02:00
SpaceToad
bc317bdec0 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-09-14 15:43:20 +02:00
SpaceToad
4e843c5104 fixed deadlock when getting properties from main thread 2014-09-14 15:43:09 +02:00
AEnterprise
1ef8640417 no need to compute item if not droped 2014-09-14 15:15:44 +02:00
AEnterprise
903ec1c107 fix blueprint not dropping form construction marker 
fix construction marker accepting more then 1 blueprint
 2014-09-14 13:16:27 +02:00
SpaceToad
b906f7b7a8 attempt at moving MJ => RF units, for #2015 2014-09-14 12:30:04 +02:00
SpaceToad
ff527353c5 fixed save / load of input/output states, fix #2011 2014-09-14 10:57:49 +02:00
SpaceToad
cdd9ae1199 fixed indentation 2014-09-14 10:44:27 +02:00
SpaceToad
55f4efb65c re-activated engine pumping, following RF migration 2014-09-14 10:27:15 +02:00
SpaceToad
93961e9d9e fixed powered tile detection for engines, following RF migration 2014-09-14 09:41:11 +02:00
SpaceToad
411ec984f0 fixed icon setting 2014-09-14 09:40:46 +02:00
SpaceToad
b268433b4c fixed RF battery save / load 2014-09-13 10:57:29 +02:00
SpaceToad
fd8d8531a1 Merge pull request #2014 from AEnterprise/6.1.x 
create events for external research
 2014-09-13 09:42:18 +01:00
AEnterprise
4cdfa5cddd more cleanup 2014-09-11 16:43:05 +02:00
AEnterprise
75079f2d9a fix indentation 2014-09-11 12:36:14 +02:00
AEnterprise
0a716a96bb Fix indentation 2014-09-11 09:30:11 +02:00
AEnterprise
35213b643a last style errors 2014-09-10 15:26:35 +02:00
AEnterprise
1da9ec0a26 second attempt at fixing style 2014-09-10 15:18:23 +02:00
AEnterprise
cfb63644b4 create events for external research 2014-09-10 14:43:06 +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
f38a299702 fixed handling of energy for robot load and robot steam 2014-09-07 13:07:00 +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
SpaceToad
f814fa67f7 implemented capture of existing blueprints for composition, for #1544 2014-09-07 10:50:20 +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
b9f10af73b fixed orientation of sub-blueprints, for #1544 2014-09-06 17:55:45 +02:00
SpaceToad
66e5e8387d fixed anchor rotations, for #1544 2014-09-06 17:44:18 +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
SpaceToad
a703d946b1 Merge branch 'iron-engine' of github.com:Prototik/BuildCraft into Prototik-iron-engine 
Conflicts:
	common/buildcraft/energy/TileEngineIron.java
 2014-09-06 12:28:50 +02:00
SpaceToad
ca9a9ec4a4 made progress with composite blueprints, for #1544 2014-09-06 11:49:52 +02:00
RufusStark
164adbb88e flow rate multipliers 2014-09-06 03:12:03 -05:00
SpaceToad
9f71fdfe0e fixed style 2014-09-04 20:55:50 +02:00
asiekierka
e6dc8e83ef fix rounding errors temporaily by flooring and not rounding 2014-09-04 20:08:01 +02:00
asiekierka
1bd6026a2d Emerald Kinesis Pipes should not connect to each other 2014-09-04 20:01:37 +02:00
asiekierka
af6297c73b fix robots in API 2014-09-04 19:51:50 +02:00
asiekierka
4dc8449d46 fix lasers and GUIs 2014-09-04 19:35:37 +02:00
asiekierka
0bbd40e25f Merge branch '6.1.x' of https://github.com/BuildCraft/BuildCraft into 6.1.x 2014-09-04 19:23:15 +02:00
asiekierka
9f503283d0 tweaks to power behaviour 2014-09-04 19:19:29 +02:00
asiekierka
3f81bb3262 Emerald Kinesis Pipe 2014-09-04 13:07:37 +02:00
asiekierka
fd672003fa finish porting the pipe system 2014-09-04 12:17:43 +02:00
SpaceToad
97cfb13de6 initial work for composite blueprints, #1544 2014-09-04 08:49:23 +02:00
asiekierka
13368007f7 port wooden/emerald/emzuli item pipes 2014-09-03 20:17:20 +02:00
asiekierka
f477d66b00 port all pipes but two: wooden item pipe and wooden power pipe 2014-09-03 19:47:22 +02:00
asiekierka
95e77f77c3 fix TileEnergyEmitter mistake 2014-09-03 19:27:31 +02:00
asiekierka
cba7b0ba18 Port over everything but pipes. 2014-09-03 19:22:15 +02:00
asiekierka
ab84e095cd start removing the "new" MJ API, commit RedBuildCraft engine implementation 2014-09-03 11:21:08 +02:00
RufusStark
35ef452017 add Quartz Fluid Pipe (20mb/t) 2014-09-01 01:18:31 -05:00
Prototik
ae184f76b2 Rewrite fuel/coolant api for iron engine 
Add lava as fuel source
 2014-08-29 19:08:34 +08:00
Prototik
fb6a30a06c Fix strange npe in facade item renderer 2014-08-29 15:27:01 +08:00
SpaceToad
77e68d2528 removed manual computations of guiLeft / guiTop 2014-08-29 00:33:15 +02:00
SpaceToad
c37a8a2985 fixed style 2014-08-29 00:07:27 +02: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
TheIrresponsible
f2c682b30f fixed door schematic saving, for #1962 2014-08-22 18:21:41 +02:00
SpaceToad
f9b769bdde Implemented pump robot, close #1985. 
Fixed race conditions with robot registry.
 2014-08-18 23:32:11 +02:00
SpaceToad
fb83ca8e99 fixed hanlding of filter on fluid unload, for #1985 2014-08-18 09:15:51 +02:00
SpaceToad
4f41d134a7 added control of wether an AI can be loaded from NBT 2014-08-18 09:07:57 +02:00
SpaceToad
846e186c9a fixed crafter robot not reseting 2014-08-18 08:49:02 +02:00
SpaceToad
85db514e0a Further bugfixes. 2014-08-17 17:40:12 +02:00
SpaceToad
d70184c3ae various minor fixes 2014-08-17 14:18:37 +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
a38bedf5fe start filter implementation for fluids, #1985 2014-08-17 10:21:33 +02:00
SpaceToad
2c69299172 finish first implementation of fluid transporter, #1985 2014-08-16 18:03:20 +02:00
SpaceToad
746b7d4b7a fixed style errors 2014-08-16 10:27:03 +02:00
SpaceToad
35c50e2da3 improved steam direction, for #1986 2014-08-16 10:20:56 +02:00
SpaceToad
fd777f9b67 Robot now show they contents, for #1986. 2014-08-15 19:33:59 +02:00
SpaceToad
4b5e9aa23e added smoke animation for #1986 and fixed various bugs 2014-08-15 18:48:51 +02:00
SpaceToad
bebd14a9dd started work on fluid-related robots, for #1985 2014-08-15 17:19:30 +02:00
SpaceToad
d366329c2f refinements in item unloading / disposal AIs 2014-08-15 12:42:55 +02:00
SpaceToad
1bd39d326a implemented delivery robot, for #1984 2014-08-15 10:55:28 +02:00
SpaceToad
19989256e2 moved ResourceId to API, fixing compilation errors 2014-08-15 00:39:22 +02:00
SpaceToad
66aabc625b implemented requester interface for builder, for #1973 2014-08-15 00:35:34 +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
2c7617b126 fixed compilation error 2014-08-13 23:07:01 +02:00
SpaceToad
420416e704 Merge branch '6.0.x' into 6.1.x 
Conflicts:
	common/buildcraft/transport/ItemFacade.java
 2014-08-13 23:04:58 +02:00
SpaceToad
79bba8834f Merge branch 'landmark' of git://github.com/Prototik/BuildCraft into 6.0.x 2014-08-13 23:00:37 +02:00
SpaceToad
6227fbc4b0 further protection against possible null icons 2014-08-13 22:58:42 +02:00
SpaceToad
9df8283987 added protection against exception raised 2014-08-13 22:56:26 +02:00
SpaceToad
d084cb3bbd reduced distance required for docking 2014-08-13 22:27:25 +02:00
SpaceToad
81095c86b4 fixed non-terminating crafting robots, for #1973 2014-08-13 22:26:37 +02:00
SpaceToad
f9c93ecc81 removed ability to place pluggable over one another 2014-08-13 22:15:32 +02:00
SpaceToad
f864f16f0a added assembly table drivers to crafting robot, for #1973 2014-08-13 22:11:44 +02:00
Prototik
69a09c9ac0 Remove landmark's levitation. It's broken physics. 2014-08-13 17:16:01 +07:00
SpaceToad
8c5b2563d3 added stability against non-loaded or deleted robots 2014-08-13 10:32:40 +02:00
SpaceToad
7798953087 Progress on crafting robots (#1973) 
Added centralized notion of resources for robots.
Removed urbanist tasks, as they're being replaced by robot ai.
 2014-08-12 23:23:43 +02:00
tterrag1098
7351eb9a5f Add check for no null IIcons on facade registration 
Continuation of #1977
 2014-08-11 20:21:08 -04:00
SpaceToad
0e78b4a308 progress in interaction of crafting robot and furnace, for #1973 2014-08-08 09:36:11 +02:00
SpaceToad
0b6ff77515 made progress for crafter robot, #1973 2014-08-07 09:40:17 +02:00
SpaceToad
9475faf2a8 minor fixes from previous modifications 2014-08-07 09:33:03 +02:00
SpaceToad
a49b37c981 added support for ore-based recipes, for #1973 2014-08-05 23:23:24 +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
29c3d92f9c Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-08-05 08:55:58 +02:00
SpaceToad
9ceaabfead started work on crafting robot and related blocks, for #1973 2014-08-05 08:55:45 +02:00
SpaceToad
e92b7e9828 Merge pull request #1965 from Parker8283/patch-log4j 
Updated logging to log4j2
 2014-08-03 20:34:33 +02:00
ganymedes01
9e5e3c5f30 Fix builder/filler work not rendering if player is far away 
If the player is standing further than 64 blocks away (which is far enough for most blocks but not for the builder/filler since the area where they render can get quite big) tile entities aren't rendered.

This is fixed by overriding that method.
 2014-08-03 15:14:21 +01:00
SpaceToad
6c88ad2ae8 Started convergence on a pre-alpha release. 
Science book is deactivated.
Redstone parameter mechanics have been removed, all replaced by gates.
 2014-08-03 12:19:58 +02:00
SpaceToad
8a0222a2ff Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-08-03 11:38:53 +02:00
SpaceToad
0e408c5538 made progress for science book, for #1951 2014-08-03 11:38:35 +02:00
Parker
37adec2afe Updated logging to log4j2 2014-08-02 11:33:58 -04:00
ninehous
ecc4cc0459 Fixes #1956 
I did some thinking and realized that the intended behavior would probably be allowing the placement of a blank blueprint without anything happening. That is the same behavior of the builder has I think it should be the same.
 2014-07-31 19:31:38 +03:00
SpaceToad
23e841f323 started integration of robots in research tree, for #1951 2014-07-29 08:54:00 +02:00
SpaceToad
4a1bc66d63 made progress with addition to research tree, for #1951 2014-07-28 23:51:50 +02:00
SpaceToad
149700c721 Merge branch '6.1.x-research' into 6.1.x 2014-07-27 23:06:13 +02:00
SpaceToad
48d95b1e26 made progress with research book, for #1951 2014-07-27 23:05:35 +02:00
AEnterprise
854b733e92 more accurate aiming of the lasers 2014-07-27 14:07:18 +02:00
SpaceToad
8006427a0b Merge pull request #1937 from Itaros/facadesexposure 
Redesigned texture state system
 2014-07-25 08:45:36 +02:00
SpaceToad
d10c570466 start work on science book 2014-07-25 08:40:47 +02:00
Semion Nadezhdin
5330f9860c Removed On-Demand Holder 2014-07-24 15:10:37 +04:00
Semion Nadezhdin
ab352e4014 Comments and licensing fixes 2014-07-24 13:31:15 +04:00
SpaceToad
01273bd63c Fixed style. 2014-07-22 19:52:10 +02:00
SpaceToad
7f5d086696 hide buttons and items when doing fullscreen map 2014-07-21 18:04:38 +02:00
SpaceToad
1e04358334 Generalized packet slicing. 
Added texture for zone planner.
 2014-07-21 17:45:59 +02:00
Semion Nadezhdin
9c084eadc5 Removed abandoned mask and provided default texture 2014-07-21 19:25:29 +04: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
c960176f57 implemented smart loading of image from center to borders 2014-07-20 12:28:49 +02:00
SpaceToad
04bce9dc5c initial experiments with map planning block 2014-07-19 21:27:50 +02:00
Semion Nadezhdin
17f312b56e Made FakeBlock generalized singleton 2014-07-15 20:00:30 +04:00
SpaceToad
bc60546eb9 added energy management for builder robot, close #1908 2014-07-15 15:55:32 +02:00
SpaceToad
0b710d998a made progress in builder robot, for #1908 2014-07-15 12:49:55 +02:00
Semion Nadezhdin
78b3c7dfc0 fixup! Redesigned texture states system 2014-07-12 05:30:40 +04:00
Semion Nadezhdin
725644b5fc Redesigned texture states system 2014-07-12 05:11:18 +04: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
068bb6f5fa Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:30:31 +02:00
SpaceToad
91a6d08e3c fixed version requirements 2014-07-12 00:24:45 +02:00
SpaceToad
e515924e46 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:48:09 +02:00
SpaceToad
9d4465bbc5 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:26:44 +02:00
SpaceToad
ab4114dbe6 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
 2014-07-11 22:26:29 +02:00
Andrew Dudney
f9e9c6cb26 Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy. 2014-07-11 14:12:02 -06:00
Andrew Dudney
c55db01daf Removed deprecated functionality and moved to equivalent. 2014-07-11 10:50:37 -06:00
Andrew Dudney
23e8abe00a Changed from assetDir to runDir, removed excess glPushAttrib 2014-07-11 10:43:58 -06:00
SpaceToad
4c6e7bb39e Merge branch '6.0.x' into 6.1.x 
Conflicts:
	api/buildcraft/api/power/PowerHandler.java
	build.gradle
	common/buildcraft/core/robots/EntityRobotPicker.java
	common/buildcraft/factory/TileRefinery.java
	common/buildcraft/transport/TileGenericPipe.java
 2014-07-11 09:00:08 +02:00
SpaceToad
3e401acfbe Merge branch '6.0.x-1.7.10' of https://github.com/adudney/BuildCraft into 6.0.x 
Conflicts:
	build.gradle
 2014-07-11 08:53:39 +02:00
SpaceToad
1791c485af Merge branch '5.0.x' into 6.0.x 
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java
 2014-07-11 08:49:38 +02:00
SpaceToad
4144188467 fixed rendering problems, merged from 6.0.x, close #1934 2014-07-11 08:43:49 +02:00
SpaceToad
5ab655a226 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-07-10 07:57:05 +02:00
SpaceToad
b462bc6dd7 fixed robot size, deactivate robot collisions 2014-07-10 07:56:52 +02:00
SpaceToad
a668977ff5 Merge pull request #1932 from simon816/pipe-item-color 
Add support for giving items a color when calling injectItem
 2014-07-10 07:23:06 +02:00
SpaceToad
87c7c9043f added render code for builder robots, for #1908 2014-07-10 07:15:40 +02:00
SpaceToad
addad59d08 made progress with robot builder, for #1908 2014-07-09 09:00:36 +02:00
simon816
7a941c1279 Add support for injecting colored items in pipes 2014-07-08 22:38:24 +01:00
SpaceToad
b71fe3cce8 made progress for builder robot, for #1920 2014-07-08 22:40:39 +02:00
SpaceToad
23d46e2bce made progress with builder robot, for #1908 2014-07-07 00:19:01 +02:00
SpaceToad
3ccb215cf9 fixed error in previous change 2014-07-06 23:06:56 +02:00
SpaceToad
4c731c533c started work on builder robot, for #1908 2014-07-06 16:59:37 +02:00
SpaceToad
fcab170b0b fixed style 2014-07-06 14:46:40 +02:00
SpaceToad
40c882de25 Various fixes in robot behavior. 2014-07-06 13:22:58 +02:00
SpaceToad
6de8ad01ea improved behavior of farmer robot 2014-07-06 00:21:37 +02:00
SpaceToad
6e824d55ab various robot fixes 2014-07-05 17:53:31 +02:00
SpaceToad
f60595c821 fixed gate rotation in schematic, close #1930 2014-07-05 15:15:15 +02:00
SpaceToad
72b1a3cfe6 fixed handling of byte arrays 2014-07-05 14:06:10 +02:00
SpaceToad
57c338b9af various fixes for gates 2014-07-05 13:29:09 +02:00
SpaceToad
ffcd8188de fixed various regressions with gates logic 2014-07-05 10:08:36 +02:00
Andrew Dudney
f2f563fd39 Changed to tabs from spaces 2014-07-04 14:45:34 -06:00
Andrew Dudney
59d36f31d0 Changed style to reflect CheckStyle 2014-07-04 14:35:36 -06:00
Andrew Dudney
ca5bbc3f17 Changed all deprecated functionality to it's equivalent, updated to 1.7.10-10.13.0.1160 2014-07-04 14:30:19 -06:00
SpaceToad
036f257505 fixed style 2014-07-04 19:36:04 +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
4d35532ad1 made progress with ai load / save, for #1921 2014-07-04 08:59:23 +02:00
SpaceToad
5554cf41bc improved save / load of stations, for #1921 2014-07-03 09:32:57 +02:00
SpaceToad
59c22235bd fixed loading of picker robot, for #1921 2014-07-01 08:52:01 +02:00
SpaceToad
e9eafbc342 fixed style 2014-07-01 08:16:35 +02:00
SpaceToad
3372c3f997 finished bucher and shovelman, close #1924, close #1925 2014-07-01 08:15:44 +02:00
SpaceToad
4c86502701 started implementation of shovelman and bucher, #1924 and #1925 2014-07-01 00:33:00 +02:00
SpaceToad
1917f11f97 implemented filters for all robots, close #1922 2014-07-01 00:08:05 +02:00
SpaceToad
447bfb49d4 fixed style 2014-06-30 20:55:43 +02:00
SpaceToad
504911cff0 planter can now plant seeds, part of #1922 2014-06-30 20:54:50 +02:00
SpaceToad
c6a77d2a65 fixed style 2014-06-30 09:15:24 +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
1ab3bcef10 finished initial save / load loop, for #1921 2014-06-29 18:57:46 +02:00
SpaceToad
27cf9473c6 made progress with robot loading / unloading, for #1921 2014-06-29 16:58:44 +02:00
SpaceToad
8ca47462d5 Progress made in robot life cycle. 
Robot now die if they have no more energy or if their station is destroyed.
Improved energy requirements (by default, all robots consume 0.1 MJ / cycle).
Part of #1921
 2014-06-29 16:07:19 +02:00
SpaceToad
487b0cc7e6 fixed knight robot 2014-06-29 12:34:09 +02:00
SpaceToad
99309b381a improved carrier robot behavior and adjusted energy consumption 2014-06-29 11:55:19 +02:00
Parker Young
341ff4e972 Updated to 1.7.10 
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
 2014-06-28 11:57:16 -04:00
SpaceToad
2d0f4f43ce Merge branch '6.0.x' into 6.1.x 2014-06-28 17:17:09 +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
Raul Tambre
10d0287df1 Fixed laser data not existing in some cases 2014-06-28 15:48:53 +03:00
SpaceToad
16b2dc311e fixed else statement, for #1877 2014-06-28 14:14:32 +02:00
SpaceToad
ada0ab4311 generalized working area control, for #1877 2014-06-28 14:13:28 +02:00
SpaceToad
ecd0464379 added area control for lumberjack and planter, for #1877 2014-06-28 14:05:02 +02:00
SpaceToad
8e58dd97de decrease load of picker robots 2014-06-28 11:04:37 +02:00
SpaceToad
48b5564171 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-28 00:52:12 +02:00
SpaceToad
ab699b2480 no need for systematic cycle latency with sleep implementation 2014-06-28 00:51:47 +02:00
SpaceToad
ceeadf9e50 Delete ActionRobotGoToStation.java 
Delete duplicate file.
 2014-06-28 00:32:14 +02:00
SpaceToad
f61c3cacaa added station robot forbid, for #1877 2014-06-28 00:31:00 +02:00
SpaceToad
ae112cf5d0 Fixed file casing. 2014-06-28 00:02:18 +02:00
SpaceToad
008c36b570 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-27 23:42:50 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
Prototik
600b035b36 Fixed builds under unix 2014-06-27 15:11:30 +08:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00
SpaceToad
fe47f56cf1 fixed style 2014-06-26 20:55:46 +02:00
SpaceToad
e68677f906 finished implementation of bomber, close #1913 2014-06-26 20:54:56 +02:00
SpaceToad
cb68a5c563 removed duplicated code in statements 2014-06-26 08:59:04 +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
63bf1ca0df Merge pull request #1910 from tambry/facadeLoadFix6.1 
Fix ghost facades from pre-6.0.x worlds
 2014-06-25 22:56:13 +02:00
SpaceToad
35c592f041 finished implementation of career, close #1907 2014-06-25 22:54:11 +02:00
Raul Tambre
a91c5e8649 Fix ghost facades from pre-6.0.x worlds 
Essentially same as #1905
 2014-06-25 10:05:05 +03:00
SpaceToad
b400c561e3 fixed style 2014-06-25 09:00:25 +02:00
SpaceToad
dfc759de6c Started work on carrier robot, for #1907. 2014-06-24 07:32:50 +02:00
Raul Tambre
78a06e5f35 Fixed ghost facades from pre-6.0.x 2014-06-23 11:41:27 +03:00
SpaceToad
7c9993568c Added a limit to block scanning. For #1873 2014-06-23 08:32:33 +02:00
SpaceToad
afc9ce619e Fixed writing of polymorphic classes. 
Fixes #1903 and probably many others.
 2014-06-23 08:31:56 +02:00
SpaceToad
2e209805b8 separate normal terminaison from abort 2014-06-22 23:31:07 +02:00
SpaceToad
e4ab3b0fa0 Kill path finding jobs upon interruption, for #1873. 2014-06-22 17:57:10 +02:00
SpaceToad
eeb637d59f Generalized latency property, for #1873 2014-06-22 17:49:22 +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
a670949a9c Gates are now specifically providing actions specific to their side, 
for #1895.
 2014-06-22 13:02:12 +02:00
SpaceToad
8801cdedc9 removed PacketCoordinates from mapped packets, as it's only derived 2014-06-22 12:04:42 +02:00
SpaceToad
79c1ad7b7d fixed indentation 2014-06-22 12:01:40 +02:00
SpaceToad
5591de3654 Merge branch '6.0.x' into 6.1.x 2014-06-22 11:52:00 +02:00
SpaceToad
0d4f021dd3 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-22 11:51:30 +02:00
SpaceToad
9577c53313 Fixed gate extension ids synchronization, for #1895. 
Added a new concept of NetworkId, allowing to transfer ids over the network
instead of strings.
RPCs are now all handled the same way (except RPC Pipes, to be completed when
actually used).
 2014-06-22 11:49:59 +02:00
SpaceToad
bcc0f37e82 Merge pull request #1893 from tambry/MoreParameterization 
Even more parameterization and cleanup!
 2014-06-17 21:42:21 +02:00
SpaceToad
ff0307702e Inventory triggers should not be side specific by default, following #1886 2014-06-16 23:37:42 +02:00
Raul Tambre
753e4693bc Prevent possible crash when rendering a marker 2014-06-16 21:23:33 +03:00
SpaceToad
fa98a71d18 Redstone output is send to all sides again, following up on #1886. 2014-06-16 08:52:23 +02:00
SpaceToad
3630875761 Made redstone input back to non-side specific behavior. This follows behavior 
of other blocks, although side-sensitive parameter could be added. Following
up on #1886.
 2014-06-16 08:39:23 +02:00
SpaceToad
cd10225538 fixed bug when no station is found 2014-06-16 03:23:16 +02:00
SpaceToad
68ef23dbdf removed OBE comment 2014-06-16 03:00:29 +02:00
SpaceToad
afbfe26fa0 Factorised station scan code. 
Fixed world property analysis.
 2014-06-16 02:59:43 +02:00
SpaceToad
6f8466a8f4 fixed stack tooltip display in advanced UIs 2014-06-16 00:09:08 +02:00
SpaceToad
c6430035ff first attempt with AI overriding, #1877 2014-06-15 23:54:20 +02:00
SpaceToad
220ee62c10 fixed gate activation feedback 2014-06-15 21:05:53 +02:00
Raul Tambre
5292bc6f19 Even more parameterization and cleanup 2014-06-15 22:05:06 +03:00
SpaceToad
e53f267d06 fixed and / or computation with parameter actions 2014-06-15 20:52:08 +02:00
SpaceToad
7bb2351b67 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 
Conflicts:
	common/buildcraft/core/ItemMapLocation.java
 2014-06-15 19:51:49 +02:00
SpaceToad
002caaca38 first attempt at overriding AI, for #1877 2014-06-15 19:50:55 +02:00
Raul Tambre
5ecbe57320 Parameterization and minor cleanup 2014-06-15 20:27:17 +03:00
SpaceToad
4c2b425d10 fixed builds 2014-06-15 17:33:09 +02:00
SpaceToad
4d955da51f improved docking / undocking API, #1877 2014-06-15 17:20:54 +02:00
SpaceToad
19e07c11fa implemented robot station states, for #1877 2014-06-15 16:56:57 +02:00
SpaceToad
7d2e546a66 Completed support for action parameters and parametrized pipe signal. 
Finalized implementation of emerald gate.
Close #1880.
 2014-06-15 15:01:10 +02:00
Prototik
c01bfe8783 Make support for sided gates 2014-06-15 14:18:32 +08: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
0a9ffaf59f fixed parameter setting in gate gui 2014-06-15 00:24:10 +02:00
SpaceToad
40268062db started work on better pipe signal actions, for #1877 2014-06-15 00:19:30 +02:00
SpaceToad
7a71e63861 Merge pull request #1885 from tambry/ContainerItemSensitive 
Use ItemStack sensitive version of hasContainerItem()
 2014-06-14 18:05:08 +02:00
SpaceToad
149e65d2c1 Merge branch '6.0.x' into 6.1.x 2014-06-14 18:02:56 +02:00
SpaceToad
0ca64b0798 implemented a location recording, close #1882 2014-06-14 17:55:53 +02:00
Raul Tambre
eac76e9c77 Replace .getAABBPool() and .getWorldVec3Pool() 2014-06-14 18:45:06 +03:00
SpaceToad
50d670593f Merge branch 'cleanup' of https://github.com/tambry/BuildCraft into tambry-cleanup 2014-06-14 16:48:47 +02:00
SpaceToad
71687ec20c fixed style, #1880 2014-06-14 15:34:14 +02:00
SpaceToad
4f8e82b153 Continuation on gates refactoring. 
Moved some packets into RPCs.
Part of #1880.
 2014-06-14 15:29:45 +02:00
Raul Tambre
d8d42a3d17 Use ItemStack sensitive version of hasContainerItem 2014-06-13 22:12:56 +03:00
Raul Tambre
1dcabf262b Code cleanup 2014-06-13 21:11:02 +03:00
SpaceToad
b1076d8556 fixed API builds 2014-06-13 13:36:02 +02:00
SpaceToad
98f7196d0f Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-13 13:17:25 +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
Raul Tambre
df1e70cfd1 Updated to Forge 1121, fixed some typos, fix #1878 2014-06-13 12:20:59 +03:00
SpaceToad
66bfac926b adjusted fetching time 2014-06-12 19:19:56 +02:00
SpaceToad
101f591f8f Implemented leave cutter, close #1876 2014-06-12 18:29:02 +02:00
SpaceToad
e60950db9b fixed bug detected by checkstyle 2014-06-12 13:49:05 +02:00
SpaceToad
6389baa9cb Implemented planter robot, close #1874. 2014-06-12 13:46:52 +02:00
SpaceToad
defa5cab45 fixed robot re-initialization problems, #1873 2014-06-11 22:51:41 +02:00
SpaceToad
1d642f052c regular path finding is using a separate thread, #1873 2014-06-11 18:50:17 +02:00
SpaceToad
ce0c26f31d lumberjack pathfinding is now done in a separate thread, #1873 2014-06-11 18:34:42 +02:00
SpaceToad
6c52e912c7 First pass of optimization, using a chunk buffer for properties. 
Part of #1873
 2014-06-11 16:58:09 +02:00
SpaceToad
aeef94a888 Merge branch '6.0.x' into 6.1.x 2014-06-11 01:39:54 +02:00
SpaceToad
27f9e05512 fixed style 2014-06-11 01:39:40 +02:00
SpaceToad
878d5266bc fixed previous check-in 2014-06-10 17:16:49 +02:00
SpaceToad
53b5176297 fixed registry cleanup 2014-06-10 17:10:07 +02:00
Dynious
aef8260877 Made sure Version IMC message is also sent after init phase 2014-06-10 16:27:12 +02:00
SpaceToad
83e84f2687 fixed style 2014-06-10 13:27:13 +02:00
SpaceToad
0ad90d29ce Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-10 13:22:55 +02:00
SpaceToad
9e1a6ebf03 Implemented robot energy management - close #1867. 
Finished robot lumberjack - close #1869.
Implemented docking station mutual exclusion - close #1868.
 2014-06-10 13:21:17 +02:00
CovertJaguar
d99505c713 Fix block renderer to not be hugely inefficient. 2014-06-10 03:28:35 -07:00
SpaceToad
bdda0fb476 Refactored Robot AI system into smaller units. 2014-06-10 00:22:22 +02:00
SpaceToad
b83f2ae6dc fixed style 2014-06-09 17:43:16 +02:00
SpaceToad
1605a36c03 lumberjack robot now manages its axe and corresponding damage, #1869 2014-06-09 17:40:56 +02:00
SpaceToad
0d978677de added lumberjack animation, for #1869 2014-06-09 00:56:58 +02:00
SpaceToad
253c398f12 fixed robots dying 2014-06-08 14:14:16 +02:00
SpaceToad
b8aeb05dd0 fixed previous check-in 2014-06-08 13:59:43 +02:00
SpaceToad
73bb09ca93 fixed robots going through block edges 2014-06-08 13:31:31 +02:00
SpaceToad
7f5a993a07 minor tweaks in documentation 2014-06-08 12:50:18 +02:00
SpaceToad
cf393474ef minor fixes for #1869 2014-06-08 12:46:17 +02:00
SpaceToad
efcabd31a1 More work on lumberjacks. 
RPC now support entity messages.
Robots now support item synchronization between client and server.
Lumberjack now use a variable tool.
for #1869
 2014-06-08 11:58:55 +02:00
Dynious
b80c95ea03 Added Version Checker integration and fixed changelog grabbing 2014-06-08 11:17:34 +02:00
SpaceToad
10fd47b0b9 fixed style, #1869 2014-06-07 23:13:34 +02:00
SpaceToad
82b34ac62f implemented lumberjack wood search and cut, #1869 2014-06-07 23:11:55 +02:00
SpaceToad
00521143b6 Merge branch '6.0.x' into 6.1.x 2014-06-07 18:57:09 +02:00
SpaceToad
9e58783add made progress with lumberjack implementation, #1869 2014-06-07 18:56:07 +02:00
da3dsoul
576be235f7 Fix isFullFluidBlock -> fix Floodgates 
A recommit to 6.0.x instead of master
 2014-06-07 10:57:19 -04:00
SpaceToad
87c18afb76 minor style fix 2014-06-07 16:46:16 +02:00
SpaceToad
41479f2021 fixed style 2014-06-07 16:45:14 +02:00
SpaceToad
926764b0b5 picker board not takes parameters into account, #1732 2014-06-07 16:43:05 +02:00
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