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

336 commits

This branch
This branch
All branches
Author SHA1 Message Date
SirSengir
572ebf3318 Merge pull request #138 from CovertJaguar/master 
Reworked Extraction Exclusion hooks for API
 2012-07-27 14:34:11 -07:00
CovertJaguar
f56a166afa Added missing file. 2012-07-27 14:19:22 -07:00
CovertJaguar
7bba02643e Reworked Extraction Exclusion hooks for API 2012-07-27 14:16:34 -07:00
SirSengir
0122ef17db Renamed steam engine to stirling engine to better fit its actual mechanic. 2012-07-27 14:28:07 +02:00
SirSengir
d6dabd35ce Merge pull request #136 from CovertJaguar/patch-2 
Added additional constructor for LiquidTank
 2012-07-27 03:37:51 -07:00
CovertJaguar
c98cd10e73 Added additional constructor for LiquidTank 2012-07-27 01:22:15 -07:00
SirSengir
f4d5abafbd Unlinking PipeManager.java from BC core. 2012-07-27 09:49:16 +02:00
SirSengir
5bb7aa8333 Merge pull request #135 from CovertJaguar/patch-1 
Removed unused imports from BuilcraftAPI
 2012-07-27 00:28:02 -07:00
CovertJaguar
5a167f8a80 Removed unused imports from BuilcraftAPI 2012-07-27 00:23:29 -07:00
SirSengir
4bafed8830 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-26 22:48:22 +02:00
SirSengir
69d3a4bd4f Implemented IBlockExtractable.java. Should close #108 2012-07-26 22:47:49 +02:00
SirSengir
123974f846 Merge pull request #110 from lslinnet/master 
Made build.xml compatible with OSX
 2012-07-26 10:55:48 -07:00
SirSengir
f6531234e0 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-26 19:53:23 +02:00
SirSengir
bbc921ccdf Moved BptBlockUtils.java. Closes #134. 2012-07-26 19:52:27 +02:00
SirSengir
5402464c8d Merge pull request #132 from CovertJaguar/patch-5 
Added Iron Eng support for container.amount != 1000
 2012-07-26 10:31:12 -07:00
SirSengir
711f7eebe8 Merge pull request #133 from CovertJaguar/patch-6 
Closes #3
 2012-07-26 10:12:02 -07:00
CovertJaguar
c927854092 Might fix issue #3 2012-07-26 10:06:28 -07:00
CovertJaguar
fed2e59254 Added support for non-standard liquid containers 2012-07-26 09:51:20 -07:00
Krapht
c51c68b2ba Merge pull request #130 from ZeldoKavira/master 
Closes #60
 2012-07-26 04:07:31 -07:00
ZeldoKavira
c8b971b0db Fixed issue 60 
Made the quarry reinitialize when you whack it with a wrench #45
 2012-07-26 06:49:12 -04:00
Krapht
1f29062a78 Now render the correct texture for sub-mod pipes 2012-07-25 20:22:02 +02:00
Krapht
723fec37a0 Merge pull request #128 from ZeldoKavira/master 
A bug from that refactoring update that stops building
 2012-07-25 10:37:45 -07:00
ZeldoKavira
7fc41d8d29 Fix import bug from refactoring 2012-07-25 13:32:54 -04:00
SirSengir
140a86e8aa Merge pull request #125 from ZeldoKavira/master 
PipeLoss Config, NPE fix on iron engine and quarry
 2012-07-25 09:39:21 -07:00
ZeldoKavira
879a268f40 Merge remote-tracking branch 'SenGir/master' 2012-07-25 12:21:18 -04:00
ZeldoKavira
739ef3e450 Iron Engine Fix, removed the iron engine explosion options 2012-07-25 12:07:09 -04:00
SirSengir
ef603b0d42 Fixed namespace. 2012-07-25 12:45:15 +02:00
SirSengir
6589f16ea9 Moved common API to seperate subpackage. 2012-07-25 12:17:22 +02:00
SirSengir
0fe5c6a31e Moved blueprint related API to seperate subpackage. 2012-07-25 12:06:15 +02:00
SirSengir
4194aacfad Moved transport related API into own subpackage. 2012-07-25 12:00:15 +02:00
SirSengir
fbdefd5d5d Merge branch 'master' of github.com:SirSengir/BuildCraft 
Conflicts:
	common/net/minecraft/src/buildcraft/factory/BlockFrame.java
	common/net/minecraft/src/buildcraft/factory/BlockPlainPipe.java
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportPower.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
 2012-07-25 11:54:43 +02:00
ZeldoKavira
1ca0d48e31 PipeLoss config option and rare quarry NPE fix 2012-07-25 01:57:15 -04:00
Krapht
beca597140 Added saving of facades to NBT 2012-07-25 00:36:12 +02:00
Krapht
b6dcb9749f Added netsync for liquids 2012-07-24 23:53:57 +02:00
Krapht
414b6e5aa4 Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-24 21:36:37 +02:00
SirSengir
ed1c5590f6 Renamed and moved ILegacyPipeConnection.java out of API. 2012-07-24 12:19:04 +02:00
SirSengir
d3b7045810 Move TileNetworkData.java from API to core. 2012-07-24 12:13:19 +02:00
SirSengir
2184f902f1 Removed obsolete imports. 2012-07-24 12:11:23 +02:00
SirSengir
81b5004112 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-24 12:09:49 +02:00
SirSengir
6562aa1810 Removed obsolete API functions and classes. 2012-07-24 12:07:47 +02:00
SirSengir
5662915ecb Merge pull request #120 from bartbes/WoodenPipeNPE 
Fix NullPointerException on wooden pipes when the inventory is empty / also closes #117
 2012-07-23 08:01:06 -07:00
Bart van Strien
60c13e0f70 Fix NullPointerException on wooden pipes when the inventory is empty 2012-07-23 16:57:15 +02:00
Kyprus
c73f10752e Fixed missing import. 2012-07-22 20:39:40 -04:00
SirSengir
3d04befa64 Merge pull request #116 from Bart97/master 
Add a work scheduled and work done triggers to the assembly table
 2012-07-22 08:07:42 -07:00
Krapht
906df0a278 Merge branch 'master' into FacadesRefactor 
Conflicts:
	common/net/minecraft/src/buildcraft/transport/Pipe.java
	common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java
	common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
	common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsObsidian.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsStripes.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsWood.java
	common/net/minecraft/src/buildcraft/transport/pipes/PipePowerWood.java
 2012-07-22 13:14:25 +02:00
Bart
cdc429872a Added Work scheduled and Work done triggers to Assembly Table. 2012-07-22 14:02:53 +03:00
SirSengir
b50c4de239 Merge branch 'LiquidPipeRewrite' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite 2012-07-22 09:43:58 +02:00
SirSengir
c6c6a0c9cb Merge branch 'master' into LiquidPipeRewrite 2012-07-22 09:43:03 +02:00
Krapht
40d96a1602 Added saving, liquid wooden pipes no longer allow liquid to go back into the tank, fixed so it works with iron liquid pipe 2012-07-21 23:55:45 +02:00
SirSengir
d6fa02ad35 Added interface for pipettes. 2012-07-21 19:56:31 +02:00