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

2110 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
SpaceToad
c2358dfe37 Update README.md 
Fixed typo.
 2014-03-13 08:29:25 +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
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
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
SpaceToad
30b00a3a2a 5.0.2 release 2014-02-19 08:37:12 +01:00
SpaceToad
b517ce2bf6 fixed (again) item facades, fix #1454 2014-02-19 08:27:53 +01:00
SpaceToad
873c39f314 added back some proxy code, fixing server load, fix #1447 2014-02-18 20:42:57 +01:00
SpaceToad
f6240d4285 Merge branch 'BuildCraft-5.0.x' of github.com:BuildCraft/BuildCraft into BuildCraft-5.0.x 2014-02-18 08:34:50 +01:00