Commit graph

4372 commits

Author SHA1 Message Date
Christian
7d700916d9 Merge branch 'miscchanges' 2013-08-04 22:27:55 -04:00
LexManos
b0f5f88482 Merge pull request #610 from purpleposeidon/patch-1
Add an InputStream constructor to WavefrontObject
2013-08-04 16:56:26 -07:00
LexManos
c6030b9125 Merge pull request #704 from StormTiberius/master
Adds cloud height to WorldType
2013-08-04 16:54:44 -07:00
LexManos
3787e5d701 Merge pull request #268 from Bo98/sh-args-fix
Fixed install.sh not passing arguments to install.py
2013-08-04 15:32:06 -07:00
cpw
81e4ae2af9 Merge pull request #706 from heldplayer/fluidRendering
Fix small derp
2013-08-03 17:29:04 -07:00
cpw
543535e1a0 Merge pull request #705 from heldplayer/fluids
Fix render colour on bottom of fluids
2013-08-03 17:28:53 -07:00
Heldplayer
647f6fdf34 Fix small derp 2013-08-03 23:42:38 +02:00
Heldplayer
90e0eaf5f5 Fix render colour on bottom of fluids 2013-08-03 23:20:34 +02:00
Bo
ea33f502fc Fixed install.sh not passing arguments to install.py 2013-08-03 17:43:57 +01:00
StormTiberius
4ea7e8d828 Add cloud height to WorldType 2013-08-03 05:45:22 +03:00
cpw
1a9a16495a Merge pull request #266 from grompe/patch-1
Add missing SideOnly in BaseMod
2013-08-01 04:21:22 -07:00
Christian
cf4f1377d4 Merge branch 'master' of github.com:EnderShadow/MinecraftForge into miscchanges 2013-08-01 07:20:30 -04:00
Grom PE
971dc1eb00 Add missing SideOnly in BaseMod
NetClientHandler exists only on client side and thus method using it should be annotated with SideOnly.
2013-08-01 14:19:30 +07:00
Matthew Warren
bf8f5aa306 added temperature to fluids
it could be useful for blocks that are affected by temperature
2013-07-31 22:15:42 -05:00
MrMasochism
9564575d77 Added a new function to allow control over whether an entity is dismounted when the entity it is riding goes under water 2013-08-01 08:02:19 +12:00
cpw
9776e0937a Merge pull request #700 from iChun/miscchanges
Fix RenderLivingEvent.Pre/Post not being fired by most Renders.
2013-07-31 01:35:18 -07:00
iChun
7b9971b20f Fix RenderLivingEvent.Pre/Post not being fired by most Renders. 2013-07-31 08:03:10 +08:00
cpw
952218c845 Add in some reverse lookup methods for game registry data 2013-07-29 22:05:22 +02:00
cpw
89d9fb3556 Updated FML:
MinecraftForge/FML@57befa89bb Fix keybindings being derped
MinecraftForge/FML@1d84e8063e Temporarily add a version of 'reobfuscate.py' that will resolve complex reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py' in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in the coming days.
2013-07-28 22:40:13 +02:00
cpw
7d31e4b25e Temporarily add a version of 'reobfuscate.py' that will resolve complex
reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py'
in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in
the coming days.
2013-07-28 22:38:26 +02:00
cpw
e71ee7721b Fix keybindings being derped 2013-07-28 20:52:12 +02:00
cpw
c3f62ed8bf Tweak setBlock in update tick - it should only send serverside updates for
source blocks. Experimental attempt to fix worldgen issues for fluid blocks
2013-07-28 19:25:51 +02:00
cpw
5c5cf3e7e7 Fix formatting error in PR 2013-07-28 19:15:00 +02:00
cpw
94045ea73e Merge pull request #695 from tommy1019/master
Fluid Rendering Fixes
2013-07-28 02:17:16 -07:00
tommy1019
e15c596e42 Fluid Rendering Fixes 2013-07-27 20:32:21 -05:00
cpw
b317d10ade Add a translation map for looking up legacy liquid names to convert
to new fluid names.
2013-07-28 01:06:16 +02:00
cpw
31bd8d438d Add support for loading legacy liquid stacks as new fluid stacks.
Requires having been written with the "liquidname" code from forge 1.5.x
2013-07-28 00:53:23 +02:00
cpw
8b78f21199 Merge branch 'master' of github.com:tommy1019/MinecraftForge into miscchanges 2013-07-27 23:59:51 +02:00
cpw
8a8f5af084 Fix names for water/lava fluids. Closes #689 2013-07-27 23:37:06 +02:00
cpw
f5a8974bb6 Merge branch 'master' of github.com:iChun/MinecraftForge into miscchanges 2013-07-27 22:57:44 +02:00
CovertJaguar
fd5b7359e2 Add SneakClick bypass to client 2013-07-27 00:30:54 -07:00
tommy1019
077e05e0ed Fixed fluids eating each other
Fluids check for other fluids density before flowing, if their density
is higher they can flow into the other fluid, if not they can't.
2013-07-26 16:25:40 -05:00
iChun
abdcd23d8b Update RendererLivingEntity.java.patch 2013-07-26 12:51:42 +08:00
iChun
fb04d10886 if statement added 2013-07-26 12:49:14 +08:00
iChun
3e8711580e Add Pre and Post events firing for RendererLivingEntity 2013-07-26 12:46:52 +08:00
iChun
f48dafda7e Add Pre and Post events for RenderLivingEvent 2013-07-26 12:38:17 +08:00
tommy1019
a42369e081 Fluid Render Fix
Formatting
2013-07-25 18:38:29 -05:00
LexManos
6397939c9e Merge pull request #665 from copyboy/master
Fix getArmorTexture by passing it the subtype
2013-07-24 13:18:31 -07:00
copyboy
c9af365d44 Fix getArmorTexture by passing it the subtype 2013-07-24 22:12:38 +02:00
LexManos
b6d543f15e Re-added deprecated liquids system. To be removed next major MC versions after issues with Fluids are fixed. (reverse-merged from commit 9b5208fa30)
This WILL be removed and should not be developed against aside for a temporary 1.6 release.
2013-07-22 15:19:35 -07:00
LexManos
8c3ebc7f87 Remove SideOnly(Client) in IBlockAccess.isAirBlock 2013-07-21 11:01:38 -07:00
LexManos
ee70b21460 MinecraftForge/FML@10b16d32da Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:38:53 -07:00
LexManos
f872ac0a90 Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:21:26 -07:00
LexManos
acb6777ab5 General code cleanup of Fluid system. Made Fluid icons and associated functions non-sided. 2013-07-16 21:40:49 -07:00
LexManos
f7ab5684e9 MinecraftForge/FML@3f21a2c1b4 Stupid spaces and windows escaping -.- 2013-07-16 14:35:22 -07:00
LexManos
f4311e2fae Stupid spaces and windows escaping -.- 2013-07-16 14:34:43 -07:00
LexManos
8a8af5265e Package 'version.json' with universal jar for maunchers to use. It's the json used by the vanilla Minecraft launcher for Forge. 2013-07-16 13:55:31 -07:00
LexManos
f72d672e0d MinecraftForge/FML@b2958c9066 Add quotes for paths with spaces -.- 2013-07-16 13:54:08 -07:00
LexManos
a9e2a2089f Add quotes for paths with spaces -.- 2013-07-16 13:35:14 -07:00
LexManos
094c2bca2e MinecraftForge/FML@9520978b81 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:12:46 -07:00