Commit graph

2411 commits

Author SHA1 Message Date
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
3fba674ef8 Merge branch 'BuildCraft-5.0.x' into NextGen 2014-02-26 23:57:08 +01:00
SpaceToad
d2b058e0f7 fixed name and added protection against NPE, part of #1465 2014-02-26 23:56:54 +01:00
SpaceToad
a18f58f60c minor enhancements to pipe support in blueprints 2014-02-26 23:50:26 +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
SpaceToad
ef2980ccc2 merged with builder branch 2014-02-23 23:28:15 +01:00
SpaceToad
681b3372f7 Merge branch 'BuildCraft-5.0.x' into builder 2014-02-23 23:25:30 +01:00
SpaceToad
830df9948f fixed id mapping computation 2014-02-23 23:16:28 +01:00
SpaceToad
d52acfa732 worked on old bpt files, and fixed requirements computation 2014-02-23 20:38:29 +01:00
SpaceToad
4ab0eaf290 last set of fixes for blueprints authoring 2014-02-23 17:36:47 +01:00
SpaceToad
5c5819f28d resurrected basic library functionalities 2014-02-23 17:14:11 +01:00
SpaceToad
d8c4d5db14 first implementation of save / load of blueprint on the disk 2014-02-23 15:33:28 +01:00
SpaceToad
8980dfdcdf reorganized class serialization, now accepts more objects 2014-02-23 11:59:30 +01: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
3dbf9b6495 re-established raw building capability 2014-02-22 13:54:47 +01:00
SpaceToad
51f0580374 initiated replacement of schematics with updated version of original Bpt code 2014-02-22 13:21:49 +01:00
SpaceToad
b4deff27bd progress in fixing back tile architect 2014-02-22 00:14:49 +01:00
SpaceToad
e55950dee6 started to resurect old blueprint system and simplified tiles with boxes 2014-02-21 21:30:12 +01: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
95cb00fe91 connected builder robots to filler urbanist 2014-02-20 21:26:54 +01:00
SpaceToad
880fc11c4f implemented synchronization of box kind 2014-02-20 09:31:33 +01:00
SpaceToad
aa65b484ac fixed villages generation, fix #1458 2014-02-20 08:47:24 +01:00
SpaceToad
84d3cd6948 fixed block urbanist rendering 2014-02-20 08:43:05 +01:00
SpaceToad
d27f8d90ab fixed serialization for urbanist over the network 2014-02-19 23:37:35 +01:00
SpaceToad
4b144864d6 avoid using entities when rendering frames 2014-02-19 22:43:29 +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
bcd31a1f96 made progress in block selection from third person view 2014-02-19 00:23:06 +01:00
SpaceToad
2f1eb04d5d merged with builder 2014-02-18 21:22:58 +01:00
SpaceToad
85149631ad merged with 5.0.x branch 2014-02-18 21:20:29 +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
SpaceToad
f8311fd5d1 fixed build number 2014-02-18 08:34:24 +01:00
SpaceToad
922a82b639 Merge pull request #1453 from Cisien/patch-1
Squishing some left over ants...
2014-02-18 08:25:30 +01:00
Chris
cca86dd041 Squishing some left over ants... 2014-02-17 16:26:29 -08:00