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

1037 commits

This branch
This branch
All branches
Author SHA1 Message Date
TarzanBuzzyMan
6e07805fce Update BlockOilStill.java 
I forgot something
 2013-03-27 23:54:53 +13:00
TarzanBuzzyMan
9baae232e3 Update BlockOilStill.java 
Fix quick bug that Flow86 pointed out.
 2013-03-27 23:48:56 +13:00
TarzanBuzzyMan
7280fa7165 Updated for obfuscations 
The field 94425 that I duplicated is a private field, and the names that someone has put as the deobfuscation name of the real one is a pile of crap so I will leave it as that till I or someone else can come up with a better one.
 2013-03-22 19:45:10 +13:00
Tarzan
0f6b311ffa Updated to oil textures that Sparkst3r supplied 2013-03-18 21:34:34 +13:00
Tarzan
42a981e035 Oil textures 2013-03-18 12:05:25 +13:00
TarzanBuzzyMan
6dea7dfaff Update BlockOilFlowing.java 
Updated to use 1.5 texture system for liquid.

Checked that it will compile but untested code. The 2 methods works for my own liquid in test environment.

Do not merge if you have already updated the oil so that it textures.

Still needs the actual texture/animation files
 2013-03-18 11:56:01 +13:00
Krapht
b8db6ef027 Merge pull request #683 from TarzanBuzzyMan/patch-2 
Update BuildCraftCore.java to use config.hasChanged()
 2013-03-17 15:09:21 -07:00
TarzanBuzzyMan
e784f614d3 Update BuildCraftCore.java 
Put config.hasChanged() on config.save() to fall in line with lex's merge on Forge.
 2013-03-18 11:05:45 +13:00
Krapht
7672b7fc24 Underp 2013-03-16 18:48:48 +01:00
Krapht
0f672972fe Started fix on actions/triggers, untested 
Removed Action and Trigger from API
Moved IIconProvider to API
Renamed Action -> BCAction
Renamed Trigger -> BCTrigger
 2013-03-16 09:21:48 +01:00
Krapht
c5ebbbdf48 Fixed Pipes, Gates, Wires and several items 
Actions and Triggers remain
 2013-03-16 00:47:08 +01:00
Christian
145e5df557 Delete getTextureFile from everything. It's gone. 2013-03-15 15:08:55 -04:00
CovertJaguar
e2e47f0f81 Tweaked Hopper fill speed 2013-03-14 08:40:41 -07:00
Krapht
ac7ab97353 Facade items render the block part correctly, pipes still messed up 
Pipe render state defaults to dirty to trigger a sync when placing a pipe
 2013-03-13 23:27:36 +01:00
Christian
4ed51b5522 A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up. 2013-03-12 15:43:39 -04:00
SirSengir
28754ac6da Fixed rename. 2013-03-10 17:38:16 +01:00
Krapht
52b7ce7d36 Fixed Action/Trigger textures 2013-03-09 19:43:33 +01:00
Krapht
04726b05c1 Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 17:51:18 +01:00
Krapht
263b0068b9 Moved GuiIcons and Triggers to subfolders 
Cleaned up icons for items and textures
 2013-03-09 17:47:40 +01:00
Christian
0ee0382060 Split sheets for krapht 2013-03-09 10:50:45 -05:00
Krapht
ffa806418d Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 15:28:00 +01:00
Krapht
90f776be7a Fix derp 2013-03-09 15:05:08 +01:00
Krapht
9cdd23f03d Migrated gates 
Minor renaming
 2013-03-09 14:46:03 +01:00
Krapht
365a0c0a47 Renamed pipe related textures 
Ported Pipe textures (Pipe "api" changed for submods)
Ported Wire textures
Updated pipe sync to accomodate Icons
Updated all pipes to new "api"
Nerfed Herobrine
 2013-03-09 02:26:11 +01:00
Christian
df26c32121 Huge amount of fixes. Still a LOT to go. 2013-03-07 00:31:35 -05:00
Christian
7089244846 Merge branch 'master' into mc1.5 2013-03-06 18:23:28 -05:00
Christian
e06e30dc87 First draft. Still lots to do. 2013-03-06 18:22:17 -05:00
Krapht
69ac580b3f Made the ACT respect ISidedInventory 2013-03-04 20:57:25 +01:00
Christian
55660989e4 Fix dupe bug on TileAssemblyAdvancedWorkbench 
Closes #634
 2013-02-26 14:24:15 -05:00
SirSengir
c15f011a02 Merge pull request #652 from AartBluestoke/patch-6 
Update common/buildcraft/transport/PipeTransportItems.java
 2013-02-22 00:19:47 -08:00
Player
86897df6ec (hopefully) fix quarry target search 2013-02-21 22:20:37 +01:00
Andrew Hill
8354db8e21 Update common/buildcraft/transport/PipeTransportItems.java 
LogisticsPipes would like to be able to handle reversed items ourselves. (in some cases we want to buffer, and try to eject once the associated machine/inventory has space)
 2013-02-21 20:57:13 +10:00
Player
d609f9662f .. for real 2013-02-21 03:55:13 +01:00
Player
d10cd4bc4a fix previous commit 2013-02-21 03:53:01 +01:00
Player
f1a7ebf484 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-21 00:28:49 +01:00
Player
99c8402df1 use a better algorithm when grouping items in transport pipes 2013-02-21 00:26:59 +01:00
SirSengir
6431318a8d Merge pull request #649 from AartBluestoke/upstreamMaster 
another null check needed
 2013-02-20 08:11:05 -08:00
Player
7146463b21 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-20 16:54:30 +01:00
Player
81db6ee4c5 fix transport pipe explosions not destroying the pipe 2013-02-20 16:53:37 +01:00
Andrew Hill
131f2459ed another null check needed 
the crafting helper is not used anywhere other than the 3 places that
have null checks. (this was the third location)
 2013-02-21 01:50:51 +10:00
SirSengir
36fa2068bf Merge pull request #647 from AartBluestoke/upstreamMaster 
correction to the previous commit
 2013-02-20 07:27:41 -08:00
Andrew Hill
a48e184ddb correction to the previous commit 
please --squash this or the previous ones.
(and i'll try not to write up commits using the web interface, even for
simple things in the future)
 2013-02-21 01:04:11 +10:00
SirSengir
041e4afcf6 Merge pull request #646 from AartBluestoke/upstreamMaster 
check for null recipe
 2013-02-19 23:22:29 -08:00
Andrew Hill
d16e44fb81 check for null recipe 2013-02-20 11:04:35 +10:00
SirSengir
c211af80ee Merge pull request #641 from AartBluestoke/upstreamMaster 
cache the IRecipe
 2013-02-19 04:53:45 -08:00
Andrew Hill
6d700c4adc move CraftingHelper. 2013-02-19 10:04:30 +10:00
SirSengir
8d5fd2a35b Merge pull request #640 from AartBluestoke/patch-6 
math.ceil() is very slow
 2013-02-18 07:46:42 -08:00
Andrew Hill
7d23bda09f add a method to get the recipe. 2013-02-18 16:11:01 +10:00
Andrew Hill
1730feed03 cache the IRecipe 
act's should not re-search for their recipe, when the last recipe found
is still able to be used.

CraftingHelper.findMatchinRecipe() is identical to
vanilla.CraftingManager.findMatchingRecipe, except it returns the
IRecipe, rather than just the result.
 2013-02-18 14:41:00 +10:00
Andrew Hill
2e2e1d8ce8 math.ceil() is very slow 
see http://imgur.com/nT62QYQ
math.ceil is almost 100% of the cpu cost of pipePowerWood and transport.pipeTransportPower
(full nps from 
https://www.dropbox.com/s/01ywgc8lnyr2es2/1361111585024.nps?dl=1
several hundred k items extracted from ex-dim barrels, sent to a set of act's, crafted to blocks, and then sent back to barrels.

sendStack->queueRoutedItem() is to do with logistics HUD display, and is being worked on lag-wise also.)
 2013-02-18 12:26:25 +10:00