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
5812d4f0bf Merge branch 'BuildCraft-5.1.x' into NextGen 
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
	common/buildcraft/energy/BlockEngine.java
	common/buildcraft/factory/BlockTank.java
	common/buildcraft/transport/pipes/PipeItemsEmerald.java
 2014-04-26 13:39:01 +02:00
SpaceToad
3fc344c9b9 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-26 13:12:48 +02:00
SpaceToad
35791deb88 minor reformating 2014-04-26 10:21:54 +02:00
SpaceToad
2ce577bd39 Merge branch 'NextGen' of https://github.com/AlexIIL/BuildCraft into AlexIIL-NextGen 2014-04-26 10:20:53 +02:00
dmillerw
d2214afee7 Fixed gates rendering incorrectly in GUIs 2014-04-21 07:21:05 -07:00
SpaceToad
5d955a2e0d Merge pull request #1612 from TXX59/NextGen 
Remove deprecated/redundant code in main classes
 2014-04-20 19:04:06 +02:00
AlexIIL
9d9b134859 Update ReflectMjAPI.java 
Removed a potential NPE (this can occur when a class contains a null mjBattery object)
 2014-04-19 16:07:57 +01:00
robin4002
42d0e641b8 Fix ClassCastException in tile entity, close #1584 2014-04-19 15:27:00 +02:00
SpaceToad
b30995aea0 attempt at fixing blueprint building ordering, for #1620 2014-04-19 11:33:57 +02:00
SpaceToad
ee349e00b5 added mode where air blocks are not cleared by blueprint, close #1562 2014-04-18 23:05:34 +02:00
SpaceToad
6c42fd02bc fixed flatten and horizon filler patterns, fix #1598 2014-04-18 20:24:29 +02:00
SpaceToad
b8ec7635da fixed cactus handling in blueprint, fix #1597 2014-04-18 19:51:07 +02:00
SpaceToad
f4d1107066 fixed bed handling in blueprints, close #1617 2014-04-18 19:18:30 +02:00
SpaceToad
c5512cc42f fixed previous check-in for #1575 2014-04-18 09:25:32 +02:00
SpaceToad
d1dbabdabd completed builder status save, for #1575 2014-04-18 08:50:48 +02:00
SpaceToad
22f0ecdd36 finished saving state for blocks, for #1575 2014-04-18 08:23:48 +02:00
SpaceToad
b93c700a8a minor progress in saving builder state, for #1575 2014-04-17 21:00:56 +02:00
dmillerw
8fd7eb4f91 Merge pull request #1609 from dmillerw/engine 
Fixed creative engine desync
 2014-04-14 15:54:31 -07:00
SandGrainOne
fd9d9272b7 Change wire in recipe for gold gates 2014-04-14 20:38:24 +02:00
TXX59
11cdba5686 Remove deprecated/redundant code in main classes 
I've done a bit of cleanup in the BuildCraft code by removing any
redundant/unnessecary little things and removing all deprecated
LanguageRegistry methods from main mod classes.
 2014-04-14 17:27:59 +01:00
SpaceToad
a4744e6632 Merge pull request #1610 from robin4002/NextGen 
Fix server crash
 2014-04-14 17:09:57 +02:00
SpaceToad
d0994d6f6e Merge pull request #1607 from TXX59/NextGen 
NextGen Achievements
 2014-04-14 17:09:10 +02:00
robin4002
67c541676b Fix server crash 2014-04-14 14:07:52 +02:00
SandGrainOne
d5055969b0 Oil spouts wasn't visible above the ocean surface. 2014-04-14 01:00:51 +02:00
SandGrainOne
7d309d3399 Black list option for Emerald item pipe 
Swapped out the multi state button with a button row.
Added a new button type with interfaces.
 2014-04-13 22:08:33 +02:00
dmillerw
621a3f7525 Added missing header 2014-04-13 13:08:10 -07:00
dmillerw
b19eea0867 Merge remote-tracking branch 'bc/NextGen' into engine 
Conflicts:
	common/buildcraft/energy/TileEngineCreative.java
 2014-04-13 13:00:32 -07:00
dmillerw
2cc2183e23 Fixed creative engine desync 2014-04-13 12:59:40 -07:00
SpaceToad
e15ecdbac9 made progress in saving building items, for #1575 2014-04-13 19:22:41 +02:00
TXX59
0d0fd91d9d Oh hey look, another hotfix... 2014-04-13 17:25:20 +01:00
TXX59
87a4c7a379 Fixed import error 2014-04-13 17:24:25 +01:00
TXX59
152fc21b58 Fixed a little hiccup regarding achievements 2014-04-13 17:18:18 +01:00
SpaceToad
a65f6f5bb6 standardized headers 2014-04-13 18:05:32 +02:00
SpaceToad
b58653c90b Merge branch 'engine' of https://github.com/dmillerw/BuildCraft into dmillerw-engine 2014-04-13 18:03:42 +02:00
TXX59
fbfb697684 Add crafting events for NextGen achievements 2014-04-13 17:03:33 +01:00
TXX59
cce9ca6fb8 Add NextGen achievements 2014-04-13 17:00:18 +01:00
SpaceToad
30882a155b standardized headers 2014-04-13 08:52:48 +02:00
SpaceToad
e6d80a36e8 Merge branch 'texture' of https://github.com/dmillerw/BuildCraft into dmillerw-texture 2014-04-13 08:49:55 +02:00
dmillerw
b96480371e Make getTrunkTexture not abstract 2014-04-12 21:16:22 -07:00
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
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