50992f2112
Merge branch 'master' of github.com:KingLemming/MinecraftForge into newliquid
...
Conflicts:
common/net/minecraftforge/common/network/ForgePacket.java
2013-05-27 18:16:24 -04:00
227d4eeefa
Updated FML:
...
MinecraftForge/FML@843a13c1ab Try and clean up cycle detection output a bit
MinecraftForge/FML@82e9de8641 More tweaks to the mod sorting code
MinecraftForge/FML@ac97370f94 Add in a pretty sorting error screen
MinecraftForge/FML@f1d68ed4c8 Throw the sorting exception
MinecraftForge/FML@edc1fb24e2 Send the "suspect list", and print the suspect versions
2013-05-27 11:10:46 -04:00
6cd56ebed6
Forge Fluid System!
...
Signed-off-by: King Lemming <kinglemming@gmail.com>
2013-05-27 00:56:58 -04:00
18d87c64dd
Fix potential GL issue when atlas animations bind textures without informating RenderEngine.
2013-05-23 22:07:22 -07:00
e27de47090
Cleanup Dimension Registration packet, generate takes no arguments, and added fix to world to prevent providers from overwriting the dimension ID.
2013-05-23 22:06:13 -07:00
68a31cecb2
Merge pull request #590 from bloodmc/master
...
Add support for servers to register dimensions on client.
2013-05-23 21:45:41 -07:00
659a837fb0
Add support for servers to register dimensions on client.
...
In order to support multi-worlds such as MultiVerse, the server needs the
ability to register dimensions on client or many forge mods such as IC2
will not function correctly. This has been an issue for MCPC which
provides both Forge and Bukkit support to players. By adding the
DimensionRegisterPacket class, MCPC now has the ability to send the
required packet to client to register a dimension with DimensionManager.
2013-05-23 15:26:21 -04:00
276929901f
Introduced the framework for Forge's packet handler system. Heavily based off FMLPacket.
...
Packet splitting and reconstruction is handled.
2013-05-21 20:13:26 -07:00
e37ff3ddae
Updated FML:
...
MinecraftForge/FML@3bf50c4bbe Fix server side derp with Forge network packet handler
2013-05-21 11:02:36 -04:00
b293251c17
Fixed creative tab rendering with invalid color closes #588
2013-05-20 19:24:50 -07:00
f382679cae
Fix type in biome list.
2013-05-20 19:24:14 -07:00
75e99e2150
Add forge network handling support
...
Updated FML:
MinecraftForge/FML@4922e90d81 Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:50:59 -04:00
7f5fa36fcf
Merge pull request #584 from Chicken-Bones/hitinfo
...
Add hitInfo field to MovingObjectPosition for when an int doesn't suffice
2013-05-19 13:32:09 -07:00
7143607620
Fixed render count for stacks of blocks 40+ and distrabution of items based on scale. Closes #579
2013-05-19 13:22:12 -07:00
432023a9ba
Fix another NPE when Items are in Block range with custom renderers, Modders keep your items out of the block range! Closes #581
2013-05-19 13:09:05 -07:00
24757402c2
Add hitInfo field to MovingObjectPosition for when an int doesn't suffice
2013-05-20 02:10:57 +10:00
63b59f078a
Remember x & z passed to getTopSolidOrLiquidBlock and use it for foliage tests. Fixes #575
2013-05-16 10:12:03 -04:00
eba92ad3f8
Fix blending on the hotbar. Closes #574
2013-05-15 20:51:24 -04:00
5ca854efa8
Add in a very simple stencil bit registry to try and arbitrate between mods wanting to use stencil bits in rendering
2013-05-15 20:29:47 -04:00
2a86167c98
Updated FML:
...
MinecraftForge/FML@23b070c7d0 Alternative @SidedProxy setter for Scala.
MinecraftForge/FML@2cca7aa759 Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e. object C { @SidedProxy(...) var proxy: P = null } Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
MinecraftForge/FML@8517a824e5 Merge declaration and initialization of a variable.
MinecraftForge/FML@a3a920437f Merge pull request #230 from fnuecke/master
2013-05-15 18:49:07 -04:00
0f36b52d7d
Merge pull request #563 from Asajz/master
...
Default Quartz Ore Dictionary
2013-05-13 21:23:46 -07:00
7e702833ab
Merge pull request #568 from hitchh1k3r/master
...
Furnace XP bug fix (fixed)
2013-05-13 21:23:29 -07:00
ed5dc83c81
Merge pull request #571 from odininon/master
...
Addition: ItemStack sensitive canHarvestBlock
2013-05-13 21:22:39 -07:00
348add87b3
Merge pull request #565 from CovertJaguar/patch-1
...
Possible NPE if the liquid isn't in the LD
2013-05-13 21:09:00 -07:00
55dac73d10
Fix NPE when rendering EntityItems that are not blocks but int he block range.
2013-05-13 21:04:55 -07:00
c5b64c5eef
Created an ItemStack sensitive version of canHarvestBlock.
2013-05-13 23:33:12 -04:00
f4b9333c99
Prevent water from dropping snowballs.
2013-05-13 20:31:46 -07:00
fecb4dc35f
updated FurnaceRecipes.java.patch
2013-05-12 01:15:52 -04:00
e19ec10b7f
Fire EntityJoinWorled event for forced entities {Players and there mounts} as well, just ignore the cancelled value.
2013-05-11 12:16:37 -07:00
7ea4508933
MinecraftForge/FML@787c0c4a6a Don't spit error on LWJGL not supporting 4.3 just warning.
...
Make custom item renderers attempt to use EQUIPPED type when running first person. For backwards compatiblity, will be removed in 1.6.
And a small change to make the 1.6 check not print it's stack trace.
2013-05-11 10:59:03 -07:00
348af15cb5
Merge pull request #564 from purpleposeidon/patch-1
...
Fix render bounding box of trapped double chests
2013-05-11 09:59:07 -07:00
79aaddbf57
Merge pull request #566 from jampot5000/patch-1
...
Make getStencilBits static
2013-05-11 09:56:20 -07:00
9873eee53a
Make getStencilBits static
...
Made getStencilBits static so it can be called.
2013-05-11 16:58:02 +02:00
a88692a0f2
Possible NPE if the liquid isn't in the LD
...
https://github.com/BuildCraft/BuildCraft/issues/787
2013-05-11 04:27:52 -06:00
4cd70f5e98
Move Partical rendering down in the order, after everything else. Should fix particals rendering behind water, digging process, and selection.
2013-05-11 01:02:30 -07:00
1a52514c9d
Fix render bounding box of trapped double chests
2013-05-11 00:48:04 -07:00
c6a1db22ff
Added oreQuartz
...
Gives a default quartz Ore Dictionary (I know of at least 3 used by different mods that use Nether Quartz as an equivalent).
2013-05-10 16:29:58 -05:00
109d4ff134
RenderGameOverlayEvent.Post(ALL) is now called in GuiIngameForge
2013-05-09 14:27:59 +02:00
e805d53089
Fixed NPE in rendering dragged items.
2013-05-09 01:03:36 -07:00
ec755e09d0
Attempt to allocate a 8-bit stencil buffer when creating Minecraft's display context. If that throws an error it will revert back to it's default values.
...
Also contains a method for modders to rereive how many bits the context was created with. Closes #552
2013-05-08 17:13:19 -07:00
2b7cd66f9a
New RenderPlayer and RenderLiving events. Closes #493
2013-05-08 16:30:59 -07:00
417fff89b8
Changed to just plane entity for flexability.
2013-05-08 15:27:18 -07:00
810b03bd83
EntityPlayer sensitive version of Item.isValidArmor, deprecated older version. Closes #551
2013-05-08 15:09:53 -07:00
0444cc063c
Merge pull request #557 from pahimar/master
...
Expose the EntityLiving's combat tracker
2013-05-06 19:13:16 -07:00
c5c44c2de4
Merge pull request #556 from micdoodle8/master
...
Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types
2013-05-06 19:08:21 -07:00
da49e2fb45
Update forge_at.cfg
2013-05-06 14:23:41 -03:00
2444a80bef
Capture and fire the PlaySoundAtEntity event for The client entity. Minecraft does some odd bypasses for no good reason. Thanks iPixile for reporting this.
2013-05-04 17:39:10 -07:00
b28910e722
Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types
2013-05-04 16:59:47 -04:00
3fdbc02c54
Updated FML:
...
MinecraftForge/FML@99bb50d8f8 Improved Entity Spawn Error
MinecraftForge/FML@c0cca7f41d Merge pull request #227 from CovertJaguar/patch-1
MinecraftForge/FML@49111e9c5c Add version detection to astyle and print error if it doesnt detect version 2.0+
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:39:08 -07:00
408ced2ea2
Merge remote-tracking branch 'refs/remotes/origin/1.5.2'
...
Conflicts:
common/net/minecraftforge/common/ForgeVersion.java
2013-05-02 09:06:36 -07:00
Christian