keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
1589 commits 1 branch 2 tags 103 MiB
Commit graph

1589 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
eba92ad3f8 Fix blending on the hotbar. Closes #574 2013-05-15 20:51:24 -04:00
Christian
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
Christian
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
LexManos
0f36b52d7d Merge pull request #563 from Asajz/master 
Default Quartz Ore Dictionary
 2013-05-13 21:23:46 -07:00
LexManos
7e702833ab Merge pull request #568 from hitchh1k3r/master 
Furnace XP bug fix (fixed)
 2013-05-13 21:23:29 -07:00
LexManos
ed5dc83c81 Merge pull request #571 from odininon/master 
Addition: ItemStack sensitive canHarvestBlock
 2013-05-13 21:22:39 -07:00
LexManos
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
LexManos
55dac73d10 Fix NPE when rendering EntityItems that are not blocks but int he block range. 2013-05-13 21:04:55 -07:00
Freyja
c5b64c5eef Created an ItemStack sensitive version of canHarvestBlock. 2013-05-13 23:33:12 -04:00
LexManos
f4b9333c99 Prevent water from dropping snowballs. 2013-05-13 20:31:46 -07:00
hitchh1k3r
fecb4dc35f updated FurnaceRecipes.java.patch 2013-05-12 01:15:52 -04:00
LexManos
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
LexManos
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
LexManos
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
LexManos
79aaddbf57 Merge pull request #566 from jampot5000/patch-1 
Make getStencilBits static
 2013-05-11 09:56:20 -07:00
jampot5000
9873eee53a Make getStencilBits static 
Made getStencilBits static so it can be called.
 2013-05-11 16:58:02 +02:00
CovertJaguar
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
LexManos
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
James
1a52514c9d Fix render bounding box of trapped double chests 2013-05-11 00:48:04 -07:00
Asajz
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
Jeffrey Kog
109d4ff134 RenderGameOverlayEvent.Post(ALL) is now called in GuiIngameForge 2013-05-09 14:27:59 +02:00
LexManos
e805d53089 Fixed NPE in rendering dragged items. 2013-05-09 01:03:36 -07:00
LexManos
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
LexManos
2b7cd66f9a New RenderPlayer and RenderLiving events. Closes #493 2013-05-08 16:30:59 -07:00
LexManos
417fff89b8 Changed to just plane entity for flexability. 2013-05-08 15:27:18 -07:00
LexManos
810b03bd83 EntityPlayer sensitive version of Item.isValidArmor, deprecated older version. Closes #551 2013-05-08 15:09:53 -07:00
LexManos
0444cc063c Merge pull request #557 from pahimar/master 
Expose the EntityLiving's combat tracker
 2013-05-06 19:13:16 -07:00
LexManos
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
pahimar
da49e2fb45 Update forge_at.cfg 2013-05-06 14:23:41 -03:00
LexManos
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
micdoodle8
b28910e722 Separate EQUIPPED and EQUIPPED_FIRST_PERSON Item Render Types 2013-05-04 16:59:47 -04:00
LexManos
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
LexManos
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
LexManos
cd40aba38e Bump version number for 1.5.2 2013-05-02 09:02:26 -07:00
LexManos
46a369e932 Merge pull request #550 from cadyyan/master 
Build Script Error Handling Error
 2013-04-30 20:20:52 -07:00
James Durand
a5cc807dcd Fixed build error handling using invalid Python syntax. 2013-04-29 11:18:05 -05:00
LexManos
3242904b36 Fixed hardcoding of MC version in debug text. 2013-04-28 17:10:16 -07:00
LexManos
24f2fb1f6a Updated FML: 
MinecraftForge/FML@00f00b17bf Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
 2013-04-28 16:57:19 -07:00
LexManos
784e23668b Changelog generator will now bundle failed builds with the next successful build. Should make it look better and prevent the version numbers from being confusing. 2013-04-28 15:35:14 -07:00
LexManos
a6b8055c44 Bump version to 7.7.2 so I can make a release. 2013-04-28 14:21:33 -07:00
LexManos
2c05258205 Update to 1.5.2 PR. 
MinecraftForge/FML@f0bba74a47 Update for minecraft 1.5.2
MinecraftForge/FML@62fdbad74c Update MCP's md5 for the fixed srg files.
 2013-04-28 13:28:40 -07:00
LexManos
cffaef6e0f Merge pull request #543 from Chimaine/master 
Fix unregistering of event listener
 2013-04-26 13:07:06 -07:00
Chimaine
3061fd6db6 Replaced derpy tabs with spaces 2013-04-26 21:53:09 +02:00
Chimaine
4b4f5a07a5 Fixed ListenerListInst not being rebuild after unregistering a listener, causing calls to unregistered event listeners. 2013-04-26 12:45:45 +02:00
cpw
cb14e29cdb Merge pull request #542 from KingLemming/master 
OreDictionary additions + ItemStack maxDamage hook
 2013-04-25 18:46:06 -07:00
King Lemming
b8a17e2748 -Add vanilla Ores to the Ore Dictionary. No recipe replacement required. 
-Add NBT-sensitive getMaxDamage() for ItemStack.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-04-25 21:36:51 -04:00
LexManos
4da2992df5 Attempted a fix for the changelog generation, should print all builds back to 1 now. 2013-04-24 10:49:33 -07:00
Christian
54b3654eaa Updated FML: 
MinecraftForge/FML@cf9b5b445b Don't leave scala running in interactive mode.
 2013-04-23 23:37:56 -04:00
Christian
b483c7ee74 Updated FML: 
MinecraftForge/FML@aa200923f0 Fix patch derp.
 2013-04-23 22:51:28 -04:00
Christian
e50fb10bff Updated FML: 
MinecraftForge/FML@ddadf93ca1 Fix when an old scalac is present on the system to not fail the build
 2013-04-23 22:44:35 -04:00