Commit graph

2114 commits

Author SHA1 Message Date
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
CovertJaguar
ec0fe82252 Deps are case sensitive 2014-03-24 14:23:55 -07: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
72742a24b1 added missing import and fixed format 2014-03-19 11:33:41 +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
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
c2358dfe37 Update README.md
Fixed typo.
2014-03-13 08:29:25 +01:00
SpaceToad
1bb430bfcf Merge pull request #1495 from AEnterprise/BuildCraft-5.0.x
fix quarry chasing water
2014-03-10 19:29:00 +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
SpaceToad
36f2c12b3a Merge pull request #1483 from SoniEx2/patch-1
Fix mcmod.info author list
2014-03-08 15:23:39 +01:00
SoniEx2
4d21f5c991 Update mcmod.info
Fix author list
2014-03-08 10:58:47 -03:00
CovertJaguar
de38b80e6f Fix oil worldgen for stone-like blocks 2014-03-07 09:07:54 -08:00
SpaceToad
182c7cf74f marked 5.0.3 release 2014-03-02 17:27:44 +01:00
SpaceToad
0e1f156a8e Merge remote-tracking branch 'origin/BuildCraft-5.0.x' into BuildCraft-5.0.x 2014-03-01 10:40:12 +01:00
SpaceToad
8af4e59a6e improved file format, and reverted part of #1471 2014-03-01 10:33:26 +01:00
CovertJaguar
b80b226948 Clarify setting a dev env 2014-03-01 01:32:26 -08: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
dmillerw
9cb360af95 Fixed partially transparent facades rendering incorrectly 2014-02-26 10:33:17 -08:00
fabricator77
05693e1b0b Restore bucket handler so empty buckets fill correctly.
By default clicking on any fluid with an empty bucket will fill it with
water. BucketHandler matches the fluid block clicked on with the
matching fluid filled bucket (item)
2014-02-25 20:18:39 +10:30
Cisien
566760b270 Found some more valid facades! 2014-02-23 17:31:47 -08:00
Cisien
2443f52e16 Oh look! debug log text! <squish> 2014-02-23 16:18:31 -08:00
Cisien
b039726ef1 addFacade with an ItemStack of 0 would create a facade recipe without a block
fixed some spelling mistakes in build.grade
added IDEA project files to .gitignore
2014-02-23 15:24:49 -08:00
Chris
30207353d3 Merge pull request #1465 from BuildCraft/BuildCraft-5.0.x-facades
Mod blocks and facades
2014-02-23 01:35:39 -08:00
Cisien
fdd8800f2b Remove extra logging 2014-02-22 16:38:42 -08:00
Cisien
1c61f29259 Spaces 2014-02-22 16:20:25 -08:00
Cisien
5ebb0e4338 clean up some spaces tabs 2014-02-22 16:12:46 -08:00
Cisien
55ef362018 Better support for mod blocks in facades
Blocks can be blacklisted from becoming facades in the config
Added an IMC message for blacklisting facades. send an IMC message with the item stack, and the blacklist-facade command
Register FacadeRecipe with the RecipeSorter
Facades store the block registry block name in place of the ID. Existing facades will be updated automatically.
The add-facade IMC string message implementation now requires block registry name instead of id. (but still works with id, for now)
The FacadeRecipe handler will rotate through the meta of the blocks the facade is made from allowing cycling through variants (such as colors of wool).
2014-02-22 15:41:46 -08:00
SpaceToad
616a59c152 Merge pull request #1460 from Cisien/patch-3
Corrects srcDir property
2014-02-21 07:53:03 +01:00
SpaceToad
a69d4a3df6 Merge pull request #1461 from Cisien/patch-4
Set the block name for lasers
2014-02-21 07:42:47 +01:00
SpaceToad
8ef76cb42d Merge pull request #1459 from Cisien/patch-2
SideOnly on client only methods in gates
2014-02-21 07:41:19 +01:00
Chris
e0f968eeb9 Set the block name for lasers 2014-02-20 21:45:36 -08:00
Chris
9aed7e7cba Corrects srcDir property
Please validate this change doesn't impact other workspaces. I validated 'gradle build' and 'gradle idea'

In the IDEA workspace, the "Source Root" directory was incorrectly directed to common/buildcraft. This had to be changed to common in the IDEA workspace.
2014-02-20 20:58:53 -08:00
Chris
8d1a56f02e SideOnly on client only methods in gates
Problem: When loading a world that has gates, the server will crash with this exception:
http://paste.cisien.com/f/33730518.txt

Solution: add @SideOnly(Side.CLIENT) to the methods that deal with IIcon, since they are client-side only.

Tested item pipes with gates pulling items from a chest in single player, and in multi-player
2014-02-20 20:38:28 -08:00
SpaceToad
aa65b484ac fixed villages generation, fix #1458 2014-02-20 08:47:24 +01:00