Commit graph

2487 commits

Author SHA1 Message Date
dmillerw
daa828259d Engine rendering changes, as requested by @CyanideX 2014-04-12 21:13:42 -07:00
dmillerw
3fe4e3bfed Addition of creative engine 2014-04-12 18:31:37 -07: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
SpaceToad
09ec24852d fixed previous check-in 2014-04-12 21:35:53 +02:00
SpaceToad
21a9f41d12 prepare release 6.0.6 2014-04-12 21:34:20 +02:00
dmillerw
8267cb87ee Start of the new block renderer 2014-04-11 19:27:38 -07:00
EXTER7
b9d2816f5a Fix Filtered Buffer registering twice.
Should fix crash in forge 1057.
2014-04-11 06:42:08 -07:00
SpaceToad
da36db0a0c fixed localisation of highlight handler 2014-04-10 22:23:25 +02:00
SpaceToad
863977bcd4 completed first version of builder state save, for #1575 2014-04-10 22:20:18 +02:00
SpaceToad
c5dec93711 made progress with builder save state, for #1575 2014-04-10 21:24:13 +02:00
SpaceToad
ea382ca443 Merge branch 'pipe' of https://github.com/dmillerw/BuildCraft into dmillerw-pipe 2014-04-10 08:51:33 +02:00
SpaceToad
039e49175b Merge branch 'facade' of https://github.com/dmillerw/BuildCraft into dmillerw-facade 2014-04-10 08:48:08 +02:00
SpaceToad
da8b5b6b40 Merge branch 'NextGen' of github.com:BuildCraft/BuildCraft into NextGen 2014-04-10 08:47:45 +02:00
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
1945458f97 Merge pull request #1588 from Vexatos/patch-1
Some fixes to en_US.lang
2014-04-09 13:43:02 +02:00
Vexatos
27b594342b Some fixes to en_US.lang 2014-04-09 12:19:02 +02: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
e0c11f248b Merge branch 'BuildCraft-5.1.x' into NextGen
Conflicts:
	build.gradle
2014-04-08 14:55:21 +02: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
SpaceToad
ca3b67880d fixed entities not using requirements 2014-04-08 14:50:02 +02:00
Abrar Syed
9f55519528 removed buildNumber from the build.gradle file 2014-04-07 22:23:36 -05: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
9fbd9cb7b2 provision for BC 6.0.5 2014-04-06 18:12:19 +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