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

2768 commits

Author SHA1 Message Date
asiekierka
95427776d4 fix #2083 and redstoneInputSide bug 2014-10-23 15:47:28 +02:00
asiekierka
25aedffac3 update to 6.1.3, fix #2082 2014-10-23 14:48:02 +02:00
asiekierka
645deeb3ea Add extra getters to FlexibleRecipe for #2078 2014-10-22 19:11:54 +02:00
asiekierka
95c85ae535 fix #1599 2014-10-22 17:47:08 +02:00
asiekierka
3c24d1ecf4 hook up the bucket stripes pipe handler to the Forge fluid API 2014-10-22 16:58:01 +02:00
asiekierka
3323779c74 further stripes pipe refactor, improve API, close #1670 2014-10-22 16:44:46 +02:00
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