Commit graph

1521 commits

Author SHA1 Message Date
Krapht
df09099ca6 Merge branch 'PipeConnectionRefactor'
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
2013-04-17 08:23:53 +02:00
CovertJaguar
97ce3ff98a Merge pull request #655 from kouteiheika/master
Bulletproof the Box class against accidental world corruption and bugs.

-Don't really understand, but merged anyway.
2013-04-16 23:10:13 -07:00
Krapht
5705eb7ed7 Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 2013-04-16 07:57:39 +02:00
Krapht
b528468f99 Make sure to include up to, and including, meta 15 for facade generation (black wool) 2013-04-16 00:34:21 +02:00
Flow86
26a90d96e4 fix transport connects
remove general check on transport class
2013-04-15 10:15:09 +02:00
Flow86
44ca72ae3b add ForgeDirection to logic too 2013-04-15 09:46:52 +02:00
Flow86
aad0e4f394 fix Pipe connection generation 2013-04-15 09:36:49 +02:00
Krapht
cb231cd5e6 Removed the config option to always connect pipes. Refactored pipe connections 2013-04-14 18:24:02 +02:00
CovertJaguar
5ce65d4b47 Missed one 2013-04-14 02:22:44 -07:00
CovertJaguar
c87e2eaa87 Fixed bad texture binds
See previous commit.
2013-04-14 02:20:04 -07:00
CovertJaguar
77a3f3ceaf Fixed bad texture bind
Binding textures by directly accessing the render engine seems to cause random effects. One instance I encountered when using that method was texture binds would fail for other TESRs that used bindTextureByName().
2013-04-14 02:14:28 -07:00
Alex
fc39665aff Changed to support compatibility.
This change was made to buildcraft would work better when a IInventory returned false when calling func_102007_a function. Now continues to check other slots. (Maybe you're using func_102007_a to return true if you want items to only go into a specific slot and not out.)
2013-04-13 16:31:43 -03:00
SirSengir
ffc11cc495 Changes for 3.5.0 build. 2013-04-13 19:01:56 +02:00
SirSengir
4b82788976 Patch up potential NPE in ExtractionHandler. Closes #741 2013-04-13 18:37:12 +02:00
SirSengir
a21dfb7b5e Fixed liquid icon check to actually catch that edge case. (h/t Player) 2013-04-12 21:50:11 +02:00
SirSengir
7511a1f767 Added handling for LiquidStacks which do not have an icon set. Closes #739 2013-04-12 20:17:21 +02:00
Krapht
b624b5dd9f Fixed Icon API for Actions/Triggers 2013-04-11 19:28:34 +02:00
Flow86
08f0216be7 Merge pull request #737 from dmillerw/master
Simple change to make BlockUtils consider isAirBlock when creating an ItemStack for a block.
2013-04-10 23:35:59 -07:00
Flow86
5f9666a8b4 Merge pull request #729 from AlgorithmX2/master
Facade shouldPassSneakingClickToBlock
2013-04-10 23:34:43 -07:00
Christian
e3a2546beb Fix rendertank. Also add support for vanilla sided inventories. 2013-04-10 23:35:51 -04:00
Christian
bdf8cf7777 Require 650 2013-04-10 22:14:03 -04:00
Christian
e80d50e767 Fix for MCP names update
Fix liquid render breaking texture binds
2013-04-10 22:11:35 -04:00
Dylan Miller
4e74b295eb Forgot a closing parenthesis 2013-04-09 23:43:36 -07:00
Dylan Miller
24185aabce Made BlockUtils obay isAirBlock when creating an ItemStack 2013-04-09 23:40:34 -07:00
CovertJaguar
027a7006ff Emerald Pipes should remember their state better 2013-04-08 16:29:42 -07:00
AlgorithmX2
3230bcac51 Minor patch to allow other mo blocks to remove facades the same was as BC Pipes. 2013-04-07 15:05:01 -05:00
Krapht
b78bee2d9f Merge pull request #726 from samrg472/master
Use reobfuscate_srg
2013-04-05 23:47:57 -07:00
samrg472
f50ea85dfd Use srg reobfuscation scripts 2013-04-05 22:36:09 -03:00
Flow86
5bcf736015 Merge remote-tracking branch 'remotes/upstream/master' into upstream 2013-04-05 13:58:18 +02:00
Flow86
b64de23421 fix Pipe Renderer
closes #723
2013-04-05 13:57:44 +02:00
Flow86
08d80e1ad1 Update build.xml
Fix paths of git-checks
2013-04-05 14:40:07 +03:00
CovertJaguar
a420e7bcfb Moved Texture Bind outside the loop 2013-04-04 19:26:48 -07:00
Flow86
da25a18c98 Update ItemGate.java
fix broken language
2013-04-04 19:26:18 +03:00
Krapht
b234d242f6 Merge pull request #720 from viliml/patch-1
Update README.md
2013-04-03 11:26:37 -07:00
viliml
3777a952b7 Update README.md 2013-04-03 21:22:52 +03:00
Krapht
57073f71a0 Throw exception if an action/trigger does not return an IIconProvider 2013-04-03 20:09:42 +02:00
Krapht
b2854f18d1 Update README.md
Added "Reporting issues" section
2013-04-03 19:59:21 +03:00
Krapht
d79c4326cf Fixed serverside reference to Icon 2013-04-03 18:24:18 +02:00
Flow86
5aed4d1261 fix Engine translation/name not working 2013-04-03 09:08:07 +02:00
Flow86
ac3db7f7bd fix loosing information on chunk save/load 2013-04-03 08:56:01 +02:00
Krapht
c9830eae3d Merge branch 'mc1.5' 2013-04-03 07:41:32 +02:00
Flow86
09581d100b dont use Math.round
merges and closes #696
2013-04-02 12:51:44 +02:00
Flow86
8881f1ff12 Update build.xml
change to newer forge (623 has a bug)
2013-04-02 12:32:52 +03:00
Flow86
f058b517b5 add (independent) target for copying source only (build.xml can be used for sub-mods more easily then)
target compile will use it then
2013-04-02 09:24:31 +02:00
Flow86
1ad6209d42 Players engine corrections to target a specific amount of energy in the engine before throttling 2013-04-02 09:17:17 +02:00
Krapht
8f40131c37 Import cleanup, added warning supressions 2013-04-01 16:21:12 +02:00
SirSengir
fa6393b95b Added NPE check to prevent a crash when certain config options are unused. 2013-04-01 10:55:51 +02:00
Krapht
cb8602439f Fix breaking fx for submod pipes 2013-04-01 01:31:33 +02:00
Krapht
2095731772 Clarified javadocs Closes #609 2013-03-31 19:34:05 +02:00
Krapht
8cb7ff17a0 Remove debug output 2013-03-31 19:23:08 +02:00