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

1913 commits

Author SHA1 Message Date
SpaceToad
30df91675e Merge branch 'BuildCraft-5.1.x' into NextGen 
Conflicts:
	common/buildcraft/core/utils/BlockUtil.java
 2014-04-10 08:46:42 +02:00
dmillerw
aff0b01d3b Fixed pipes in inventory losing transparency in various situations 2014-04-09 22:08:21 -07:00
dmillerw
c721982546 Support for semi-transparent facades 2014-04-09 21:53:59 -07:00
Anton
5f03ba66a0 Should fix some issues(like grass) 2014-04-09 19:04:57 +03:00
SpaceToad
871638ddda fixed missing import 2014-04-09 08:54:28 +02:00
SpaceToad
2a2aec3a79 Merge branch 'NextGen' of https://github.com/anti344/BuildCraft into anti344-NextGen 2014-04-09 08:52:43 +02:00
Anton
ab0427ebd2 Improved bounding box for lasers! 2014-04-09 01:18:11 +03:00
Anton
bcf148e90d 'Generalize' engines. 2014-04-09 01:17:02 +03:00
Anton
9599cc0594 Delete old BlockHighlightHandler 2014-04-09 01:15:45 +03:00
Anton
409d28e45d Recreate BlockHighlightHandler in core package 2014-04-09 01:15:20 +03:00
Anton
f8f449cd93 Create ICustomHighlight.java 2014-04-09 01:13:50 +03:00
SpaceToad
43b1111ff6 fixed incorrect clearing for templates 2014-04-08 17:13:36 +02:00
Anton
7936fcece8 Whooooops =/ 2014-04-08 17:08:39 +03:00
SpaceToad
aa5915ed4e fixed template item selection 2014-04-08 15:56:56 +02:00
SpaceToad
7e0ece006b made sure requirements display as soon as the blueprint is loaded 2014-04-08 15:14:30 +02:00
SpaceToad
ca3b67880d fixed entities not using requirements 2014-04-08 14:50:02 +02:00
SpaceToad
1548d0fd68 relaxed constraints with item matching 2014-04-06 19:18:15 +02:00
SpaceToad
858efcb6f1 resurected survival recipes for builders 2014-04-06 18:15:09 +02:00
SpaceToad
d66a0e6271 some progress on the new energy system, for #1578 2014-04-06 18:05:39 +02:00
Anton
84b1d58320 Fix incorrect block placing on engines 2014-04-06 17:42:07 +03:00
Anton
ca1eb0b4ee Fix collision boxes. 2014-04-06 17:39:51 +03:00
Anton
b7a7cd0120 >_< 2014-04-06 17:00:21 +03:00
Anton
5d762c6f6d Raytrace check and proper collision boxes. 2014-04-06 16:59:11 +03:00
Anton
17e5e266cf Create BlockHighlightHandler.java 2014-04-06 16:58:06 +03:00
Anton
7b888559b8 Register BlockHighlightHandler class 2014-04-06 16:57:34 +03:00
SpaceToad
69825c8fc8 fixed item translations in inventories, fix #1565 2014-04-06 14:39:21 +02:00
SpaceToad
c55f124408 improved schematic architecture with regards to translations 2014-04-06 13:52:43 +02:00
SpaceToad
7bde6b7903 fixed entity schematic building, part of #1565 2014-04-06 00:51:02 +02:00
SpaceToad
b07d0b059d made progress for item requirements support in blueprints, for #1565 2014-04-05 19:03:53 +02:00
SpaceToad
a9701ec4e4 finished quarry fixing, fix #1561 2014-04-05 18:09:44 +02:00
SpaceToad
ac055f0b4f made progress at resurecting Quarry, for #1561 2014-04-05 17:31:59 +02:00
SpaceToad
757bea50dc improved block destroy animation, and implemented filler pattern 2014-04-05 16:10:39 +02:00
SpaceToad
2431d82225 fixed builder accepting items, fix #1555 2014-04-05 15:33:37 +02:00
SpaceToad
4bdbd13051 fixed architect progress bar, for #1546 2014-04-05 15:29:33 +02:00
SpaceToad
eb6293b0fe Merge branch 'BuildCraft-5.1.x' into NextGen 2014-04-05 15:15:53 +02:00
SpaceToad
2a57a81b51 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-05 15:14:26 +02:00
SpaceToad
ee854df500 fixed blueprints names problems in client/server, fix #1566 2014-04-05 15:09:46 +02:00
SpaceToad
fea765d875 fixed energy usage in creative and stone/gravel requirements, fix #1558 2014-04-05 14:36:08 +02:00
SpaceToad
2cd973caab various fixes, including taking into account non-breakable blocks for #1501 2014-04-05 14:18:55 +02:00
SpaceToad
115a340e80 finished resurection of item / energy consumption, fix #1503 2014-04-05 11:28:58 +02:00
SpaceToad
49ef1c9c29 made progress in destroy animation, for #1571 2014-04-05 00:09:31 +02:00
SpaceToad
c3c3a3d3f0 made progress in improvement of block breaking, for #1571 2014-04-04 09:33:55 +02:00
SpaceToad
1d97913609 re-implemented item consumption in filler and templates, for #1503 2014-04-04 08:56:17 +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
SpaceToad
e8eda47ec8 fixed iteration on filler 2014-04-02 08:46:08 +02:00
SpaceToad
374637639e new attempt at computing item speed 2014-04-02 07:57:27 +02:00
SpaceToad
635727942a fixed distance computation problem 2014-04-02 07:14:40 +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
6549ead866 initial progress for #1503 2014-04-01 09:02:30 +02:00
SpaceToad
9001521647 facorised animation code, close #1497 2014-03-31 23:20:45 +02:00
SpaceToad
d00dcf0314 fixed detection of finished build process 2014-03-30 21:10:26 +02:00
SpaceToad
f6e0d3a337 made progress with building animation, for #1497 2014-03-30 20:43:44 +02:00
SpaceToad
573ed26f60 made progress with builder animation, for #1497 2014-03-30 18:41:50 +02:00
SpaceToad
12138c4d53 added missing network synchronization, fix #1560 2014-03-30 14:02:08 +02:00
SpaceToad
546e8a0070 Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-30 13:10:25 +02:00
SpaceToad
ab75f0c623 added serializers for fluids 2014-03-30 11:50:39 +02:00
SpaceToad
c95d21255c fixed box around blueprints, for #1497 2014-03-30 00:03:09 +01:00
SpaceToad
23fb4cf295 empty pipes when reading contents, for #1536 2014-03-29 23:48:00 +01:00
SpaceToad
36baf7b108 fixed requirements for inventories, fix #1557 2014-03-29 21:50:17 +01:00
SpaceToad
967650a073 fixed blocks building too early 2014-03-29 18:41:45 +01:00
SpaceToad
d08d15d4c1 extracted array list serializer 2014-03-29 18:38:17 +01:00
SpaceToad
53b8f86db2 implemented generic schematic ordering, close #1528 2014-03-29 18:34:17 +01:00
SpaceToad
aa858467a1 removed OBE comment 2014-03-29 17:53:31 +01:00
SpaceToad
aea014b346 Minor adjustements and fixes in network system. 
Not accepts @TileEntity and @RPC methods on private members.
Fixed inherited @MjBattery fields.
 2014-03-29 17:51:08 +01:00
SpaceToad
e6f7fc7aa5 finalized initial set of blueprint options, close #1541 2014-03-29 16:57:51 +01:00
SpaceToad
307aeb2dfb start work on blueprint confirguration, for #1541 2014-03-29 16:32:38 +01:00
SpaceToad
b3b4a33af4 removed useless check 2014-03-29 16:28:06 +01:00
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
7b275c1455 fixed conflicts 2014-03-29 11:34:41 +01:00
SpaceToad
40a594ef23 fixed conflict 2014-03-29 11:33:01 +01:00
SpaceToad
df2d09e176 generalized previous change 2014-03-29 11:07:46 +01:00
SpaceToad
4191f69e14 Merge branch 'patch-1' of https://github.com/anti344/BuildCraft into anti344-patch-1 2014-03-29 11:01:23 +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
Anton
5333c1d389 Fix everything. 
Without expected exceptions! =D
 2014-03-23 00:15:29 +02:00
SpaceToad
7e4b40f254 added support for crops, fix #1539 2014-03-22 18:42:30 +01:00
SpaceToad
d4038e763c fixed engine schematics, fix #1538 2014-03-22 18:18:30 +01:00
SpaceToad
eb2f436f42 fixed handling of double doors, fix #1535 2014-03-22 18:07:38 +01:00
SpaceToad
75ddd6fb01 added missing support for painting, close #1517 2014-03-22 14:57:57 +01:00
SpaceToad
1af2a7ece5 Further progress for entity support, #1517. 2014-03-22 14:47:42 +01:00
SpaceToad
583d09d82e Making progress with entity support in blueprints, for #1517. 
Some refactorings, in particular removal of the clone operations for blueprints,
not needed anymore now that blueprints are loaded on demand by builders.
 2014-03-22 11:56:12 +01:00
Anton
5cf6d34fae I'm stupid, it was in cycle. 2014-03-21 20:35:05 +02:00
Anton
e0cabc07f7 Fix adding unaccessible fields, and their check. 
Lol.
 2014-03-21 00:11:44 +02:00
Anton
3115a6e94d Fix awesome MjBattery thing for Scala 
Since Scala compiler makes all fields private and creates getters and setters for them, i check, if there is a public(so private Scala fields doesn't count) Scala setter and if is, then set proper accessibility for the field.
You can also find some info about that in comments in cpw.mods.fml.common.ILanguageAdapter.ScalaAdapter class.

Tested.
 2014-03-19 22:41:14 +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
ba2d66e81a fixed rotation for action direction 2014-03-19 15:36:48 +01:00
SpaceToad
8a150e9064 fixed shameful out of bound exceptions, fix #1522 2014-03-19 15:18:43 +01:00
SpaceToad
3919a9dae8 added protection against world corruption, for #1521 2014-03-19 15:12:58 +01:00
SpaceToad
a37441e324 finished migration of pipes to simple energy system, close #1532 2014-03-19 14:46:23 +01:00
SpaceToad
0230f8772d made progress in pipe migration to the simple energy framework (#1532). 
removed some OBE classes
 2014-03-19 14:14:37 +01:00
SpaceToad
43f0c5cf5c added support for rotating actions and triggers, close #1515 2014-03-19 11:59:40 +01:00
SpaceToad
2d3d70f6db Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-19 11:36:15 +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
bf6f4621c5 fixed fluid behavior, close #1510 2014-03-19 11:24:46 +01:00