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

2151 commits

This branch
This branch
All branches
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
SpaceToad
98d8861ea3 migrated to forge 60 and gradle 1.2 2014-04-26 13:12:28 +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
080b4ba749 Cylinder pattern was missing the name 2014-04-14 09:42:27 +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
322f3c0eb1 fixed version number 2014-04-08 14:54:53 +02:00
SpaceToad
debec7a84e Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 
Conflicts:
	build.gradle
 2014-04-08 14:52:55 +02:00
Abrar Syed
9f55519528 removed buildNumber from the build.gradle file 2014-04-07 22:23:36 -05:00
SpaceToad
2a57a81b51 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-05 15:14:26 +02:00
CovertJaguar
1fdd0df6a9 Must use dev version 2014-04-03 12:09:27 -07: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
CovertJaguar
ec0fe82252 Deps are case sensitive 2014-03-24 14:23:55 -07: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
ebebba3282 prepare 5.0.4 version 2014-03-22 15:49:09 +01: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
SpaceToad
957a9de907 Merge pull request #1534 from Goldman60/patch-1 
Match build number to branch
 2014-03-19 10:56:56 +01:00
AJ Fite
515ab78f22 Match build number to branch 
Mostly for my CI server #1523
 2014-03-19 00:44:49 -07: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
2f1f60f987 Merge pull request #1529 from AbrarSyed/patch-2 
fix maven uploading
 2014-03-18 22:24:20 +01:00
Abrar Syed
8eea3a74e9 fix maven uploading 2014-03-18 16:08:36 -05: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
SpaceToad
0d49b93817 Merge branch 'BuildCraft-5.0.x' of https://github.com/AEnterprise/BuildCraft into AEnterprise-BuildCraft-5.0.x 2014-03-15 23:42:04 +01: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