Krapht
8192c8d792
Update names for forge build 604
2013-03-22 20:36:01 +01:00
Vilim Lendvaj
43227c6b3e
Update to MC1.5.1
...
It's a 100% compiling, 100% working and 95% textured build for 1.5.1,
MCForge build .600
2013-03-22 19:46:33 +01:00
viliml
6cb6aa55ca
Merge pull request #2 from BuildCraft/mc1.5
...
update
2013-03-21 10:58:37 -07:00
Krapht
c352bc53ad
Fix ledger Icons
2013-03-21 00:24:41 +01:00
Krapht
d23562f1e3
Uncaps method name (sorry Flow)
2013-03-21 00:22:07 +01:00
Krapht
3507cb1b0f
Fix Engine model texture binding
2013-03-19 23:00:47 +01:00
viliml
c8d0cccb91
Merge pull request #1 from BuildCraft/mc1.5
...
Mc1.5
2013-03-19 11:48:32 -07:00
CovertJaguar
39822878df
Merge pull request #688 from Flow86/patch-648
...
Resubmit for 1.5: fixes #648
2013-03-18 13:01:05 -07:00
Flow86
fef297d6d4
Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-648
...
Conflicts:
common/buildcraft/transport/BlockGenericPipe.java
2013-03-18 09:59:16 +01: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
Flow86
3b082dfddb
fixes #648
2013-03-12 09:53:10 +01: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
