Flow86
25755d57bc
Merge remote-tracking branch 'remotes/patch-oil/patch-3' into patch-renderTank
2013-03-28 09:53:48 +01:00
Christian
ca0c865f2a
Merge branch 'master' into mc1.5 and fix bug
...
Conflicts:
common/buildcraft/BuildCraftTransport.java
common/buildcraft/transport/Pipe.java
2013-03-27 23:30:30 -04:00
Christian
276cacdef6
Add in a few tweaks to autarchic gates - stacks of items if 8 pulses are set, and a "single edge" trigger mode.
2013-03-27 23:15:12 -04:00
Krapht
5703c85549
Replace BCAction and BCTrigger arrays with IAction and ITrigger arrays. Good catch AartBluestoke
2013-03-27 17:17:18 +01:00
Krapht
bd91c3ad21
Mark Builder API as deprecated
2013-03-27 17:00:44 +01:00
TarzanBuzzyMan
15430f4277
Update BlockOilFlowing.java
...
Missed an @SideOnly
2013-03-28 00:01:15 +13:00
TarzanBuzzyMan
38072c8aa7
Update BlockOilStill.java
...
Missed an @SideOnly
2013-03-28 00:00:06 +13:00
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
Krapht
07a69b4e87
Redid some textures that was dark/nontrasparent
2013-03-26 23:54:45 +01:00
Krapht
84754e1e79
lowercased texture name fixes #700
2013-03-26 23:06:16 +01:00
Krapht
005d0bc4e1
Fix marker's rendering
2013-03-25 17:56:14 +01:00
Krapht
86d69f4078
Extracted method dropFacadeItem to avoid code duplication
2013-03-23 23:09:10 +01:00
Krapht
ada2bad7b0
Merge branch 'patch-676' of git://github.com/Flow86/BuildCraft into Flow86-patch-676
2013-03-23 22:35:26 +01:00
Krapht
e7d18f8d82
Merge branch 'mc1.5' of git://github.com/Techjar/BuildCraft into Techjar-mc1.5
2013-03-23 22:32:44 +01:00
CovertJaguar
05f8b556c4
More API fixes
2013-03-23 11:34:10 -07:00
CovertJaguar
a5d5d1a436
Fixed blueprint softblock error
2013-03-23 11:00:31 -07:00
Krapht
e35e0f2240
A custom BC built from source at an arbitrary time is versionless. Versions are decided on release.
2013-03-23 18:06:10 +01:00
CovertJaguar
e9c0d29032
More API Pruning
2013-03-23 02:31:14 -07:00
CovertJaguar
da3aa8374b
Mass Cleaning & Updating
2013-03-23 02:21:06 -07:00
CovertJaguar
6cfabf56af
Merged Trigger APIs
2013-03-23 02:16:17 -07:00
Krapht
7260d9445d
Organizing imports
2013-03-23 09:40:22 +01:00
Krapht
b0fb4b3d8f
Merge branch 'mc1.5' of github.com:BuildCraft/BuildCraft into mc1.5
2013-03-22 23:01:00 +01:00
Krapht
d888cb7b8d
Fixed tank rendering in inventory
...
partially fixed the BlockMarker
fixed the template item icons
fixed the oil bucket icon
Added texture for pipeWaterproofing and moved it to the BC tab
2013-03-22 23:00:02 +01:00
Krapht
dd0122d622
Fixed the derp reverse of lit/dark gate textures
2013-03-22 22:04:00 +01:00
Krapht
eb6f7832b8
Update forge to 604
...
Revert Sengir's build.xml
Fix Icon registration in Core to use the Item atlas
2013-03-22 21:52:35 +01:00
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
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
CovertJaguar
2e9dbaa0f7
Break soft blocks before filling
...
Closes #693
2013-03-21 23:26:52 -07:00
CovertJaguar
d59a48658f
Merge pull request #697 from aznhe21/patch-mining-well2
...
Fix mining wells not put two or more stacks in pipe
2013-03-21 12:31:28 -07:00
aznhe21
2e7368150e
Fix mining wells not put two or more stacks in pipe
2013-03-22 04:06:01 +09: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
Techjar
afc4a84cd3
Spaces are now tabs >_>
2013-03-18 23:05:15 -04:00
Techjar
d2598ef011
Trigger block update when placing/removing a facade
2013-03-18 18:48:04 -04: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
Flow86
602f5b8b22
#676 : adds a generic interface for pipe(tiles) to allow them to be solid on a side, a facade always overwrites it
2013-03-18 09:48:24 +01: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
