Commit graph

1653 commits

Author SHA1 Message Date
SpaceToad
2248a2fb4d Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-28 20:05:16 +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
3fc344c9b9 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-26 13:12:48 +02:00
Meepster
1a1bb18a7a Forgot to trim ids.. Oops.. 2014-04-25 16:02:53 -05:00
Meepster
a6fa406793 Enabled use of BiomeDictionary.Type to pass in addition to IDs of
biomes. Added error handling. Doesn't seem to print the warning to the
log correctly though, just prints a string as info it looks.
2014-04-25 15:46:05 -05:00
Meepster
6892234a54 Changed Oil Generation to use config file ID's for generation to support
integration with mods like Biomes O' Plenty
2014-04-24 23:40:40 -05:00
robin4002
42d0e641b8 Fix ClassCastException in tile entity, close #1584 2014-04-19 15:27:00 +02:00
SandGrainOne
fd9d9272b7 Change wire in recipe for gold gates 2014-04-14 20:38:24 +02:00
SandGrainOne
d5055969b0 Oil spouts wasn't visible above the ocean surface. 2014-04-14 01:00:51 +02:00
SandGrainOne
7d309d3399 Black list option for Emerald item pipe
Swapped out the multi state button with a button row.
Added a new button type with interfaces.
2014-04-13 22:08:33 +02:00
Anton
daa9ab82fb Update PipeTransportFluids.java 2014-04-12 23:42:01 +03:00
Anton
591313df43 Crappy temp fix for #1576
I think it's something with time.
2014-04-12 23:32:42 +03:00
Anton
5f03ba66a0 Should fix some issues(like grass) 2014-04-09 19:04:57 +03:00
SpaceToad
2a57a81b51 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-05 15:14:26 +02:00
SpaceToad
3e67e803fc removed unused code 2014-04-03 08:50:35 +02:00
SpaceToad
8a76edd91a fixed duplate method 2014-04-03 08:44:33 +02:00
SpaceToad
78cef2a3b8 Merge branch 'BuildCraft-5.0.x' of https://github.com/fabricator77/BuildCraft into fabricator77-BuildCraft-5.0.x 2014-04-03 08:42:38 +02:00
fabricator77
f466217553 Update BuildCraftEnergy.java 2014-04-03 12:42:26 +10:30
fabricator77
a016be6919 Auto assign Biome Ids
Finds unused Biome IDs if the ones in the config are in use by other
mods. Also saves change to config file.

Changed default Biome Ids to 126 and 127 which are just below a block
used by Minecraft.
2014-04-03 12:36:37 +10:30
fabricator77
e401a69782 Auto assign Biome Ids
Finds unused Biome IDs if the ones in the config are in use by other
mods. Also saves change to config file.
2014-04-03 06:12:10 +10:30
SpaceToad
4ea6f8959f fixed flood gate and finite liquids, close #1563 2014-04-02 09:00:51 +02:00
fabricator77
2245e85773 Fix crash in BiomeInitializer when used in non standard WorldTypes
Fixes crash when BiomeInitializer runs in WorldTypes with less that three GenLayers. For example a world without river gen only has 2 Layers, the river is the 3rd.

Also remove redundant old code.
2014-04-02 10:02:59 +10:30
SpaceToad
3cf50c69f6 Merge branch 'patch-2' of https://github.com/anti344/BuildCraft into anti344-patch-2 2014-03-29 11:35:53 +01:00
SpaceToad
40a594ef23 fixed conflict 2014-03-29 11:33:01 +01:00
Anton
cb47a11853 Added IMC support for adding assembly and refinery recipes.
I think we shouldn't dismantle API adding, since if i do a complete addon it'll be easier to use, than IMC.

PS Is this just in NextGen buckets-machines behavior is broken? Or whole 1.7.2?
2014-03-24 22:08:02 +02:00
SpaceToad
7bee2a9717 Merge pull request #1470 from fabricator77/BuildCraft-5.0.x
Restore bucket handler so empty buckets fill correctly.
2014-03-19 18:19:03 +01:00
SpaceToad
e34a4b25a4 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-03-19 11:35:14 +01:00
SpaceToad
72742a24b1 added missing import and fixed format 2014-03-19 11:33:41 +01:00
SandGrainOne
8765dac0e3 Gates indicate that trigger require parameter
Also removing normal Inventory Triggers from FilteredBuffer, for now.
2014-03-18 23:00:04 +01:00
Anton
cb37886b22 Fix fluid icon 'compressing'. Another minor, that highly annoys me.
Used my universal method for any tank size.
It's opensource, after all, so that you can easily copy and use it xD
2014-03-18 23:47:06 +02:00
SpaceToad
753dc868d2 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-03-15 23:54:57 +01:00
SpaceToad
988156a290 fixed patch errors 2014-03-15 23:52:32 +01:00
Anton
120d041059 Prevent from getting broken pipe item 2014-03-16 00:44:39 +02:00
Anton
5eca225083 Resubmit for 5.0.x 2014-03-16 00:42:59 +02:00
AEnterprise
c40d3ce02c Finished the achievements
-Moved all achievements to the craftinghandler
-Added "Refine and redefine"
-Added "Tingly Laser"
2014-03-15 22:03:49 +01:00
AEnterprise
45d1458ae5 make it give the achievement to the player who places it down, not the one who is the closest 2014-03-13 20:26:50 +01:00
AEnterprise
dbc0fe42ad forgot a null check 2014-03-13 19:59:27 +01:00
AEnterprise
82de1ed0ed Make the previous achievements avalable
It didn't work to detect the crafting of the blocks so i changed it so that you get the achievement when you place the block in the world
2014-03-12 17:16:02 +01:00
AEnterprise
36cf4cbdde Added more achievements
-Added "Just hit it!"
-Added "A lot of crafting"
-Added "Straight down"
-Added "Chunk destroyeré
-Added "Faster filling"
-Added "Time for some logic"
2014-03-12 15:58:00 +01:00
AEnterprise
19d6bff276 Added first buildcraft achievements and achievement page :-)
-Added a craftingHandler
-Added "A bit rough around the edges"
-Added "Hard as a rock"
-Added "Is it stainless?"
-Added "No, it isn't made of honey"
-Added "Shiny!"
2014-03-12 14:10:46 +01:00
AEnterprise
518e411190 make quarry check for BlockLiquid 2014-03-10 17:43:12 +01:00
AEnterprise
7445ce797c fix quarry chasing water 2014-03-09 20:01:00 +01:00
CovertJaguar
ebcd3151bf Fix flowing lava matching 2014-03-08 09:40:24 -08:00
CovertJaguar
de38b80e6f Fix oil worldgen for stone-like blocks 2014-03-07 09:07:54 -08:00
SpaceToad
8af4e59a6e improved file format, and reverted part of #1471 2014-03-01 10:33:26 +01:00
SpaceToad
43a696bb11 improved file format, and fix #1414 2014-03-01 10:29:35 +01:00
Chris
f09da45e15 Merge pull request #1471 from dmillerw/BuildCraft-5.0.x
Fixed partially transparent facades rendering incorrectly
Fixes #1468
2014-02-27 15:57:48 -08:00
SpaceToad
d2b058e0f7 fixed name and added protection against NPE, part of #1465 2014-02-26 23:56:54 +01:00
dmillerw
438a6d906a Fixed indentation 2014-02-26 10:41:26 -08:00
dmillerw
07ce344751 Fixed indentation 2014-02-26 10:36:39 -08:00