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

2271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lex Manos
d2682ab969 Fix patch screwup in Skyboy's Fishing PR -.- 2014-08-05 15:17:10 -07:00
LexManos
4600b015d9 Merge pull request #1296 from Vazkii/patch-3 
Fixed items with more than 2 render passes rendering wrong in first person
 2014-08-05 13:15:59 -07:00
Lizbeth Rika
63140bcf7f Fixed items with more than 2 render passes rendering weird in first person 2014-08-05 21:10:28 +01:00
LexManos
ec0691538f Merge pull request #1292 from DemoXinMC/master 
New PlayerRepairEvent and AnvilUpdateEvent
 2014-08-04 14:34:10 -07:00
DemoXin
68fd0049fb * Added AT for ContainerRepair.stackSizeToBeUsedInRepair (Now public) 
* Added ability to AnvilUpdateEvent to alter stackSizeToBeUsedInRepair (vanilla behavior is now reproducable)
* Added AnvilRepairEvent, fired when the player removes an ItemStack from the output slot of ContainerRepair, and allows the chance to damage the anvil to be altered.
 2014-08-04 16:54:35 -04:00
KingLemming
7cd820d855 Merge pull request #1288 from skyboy/master 
Add EntityFishHook AT
 2014-08-03 22:06:26 -04:00
skyboy
5f8d501ed6 Add EntityFishHook AT 2014-08-03 19:52:59 -04:00
LexManos
224987aa83 Merge pull request #1128 from skyboy/patch-fishingapi 
Add API for fishing results, I'm tired of this, If shit breaks, Blame Skyboy and King_Lemming.
 2014-08-03 16:28:32 -07:00
LexManos
dae471e7d7 Merge pull request #1272 from rwtema/master 
Fixed ItemFluidContainer always draining the maximum amount, regardless ...
 2014-08-03 15:47:58 -07:00
Lex Manos
cd2982f9b1 Closes #1280 2014-08-02 11:32:34 -07:00
Lex Manos
10192959f9 Fixed bug that allowed duplication of Fluids with redstone dust. Closes #1279 2014-08-01 18:37:54 -07:00
rwtema
eeb701cb16 Fixed ItemFluidContainer always draining the maximum amount, regardless of the amount remaining. 2014-07-31 20:52:52 +01:00
LexManos
bc8374d71c Merge pull request #1263 from Zarathul/master 
Added drainFluidContainer() and getContainerCapacity() helper methods to FluidContainerRegistry.
 2014-07-30 13:11:58 -07:00
zarathul
7a1de8c13d - Added drainFluidContainer() and getContainerCapacity() helper methods. 2014-07-30 13:23:52 +02:00
LexManos
7170a8c4c6 Merge pull request #1254 from Adubbz/master 
Added a RenderFogEvent
 2014-07-28 13:29:49 -07:00
Adubbz
2affeae979 Added an event for fog rendering 2014-07-28 17:01:38 +10:00
skyboy
cc169c3ea1 Update FishingHooks 2014-07-25 06:42:17 -04:00
cpw
a22bcf7e72 MinecraftForge/FML@3231db9376 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets into the map, rather than force overwriting. Fixes skyboy's comment. 2014-07-24 21:41:59 -04:00
cpw
bbcc515063 Revert old light amortization patch. It seems to be breaking chunk sending pretty badly when more 
than a couple of people are online. Tests indicate it is not useful anymore.
 2014-07-24 21:40:30 -04:00
skyboy
906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
Lex Manos
9febf999c0 Updated FML: 
MinecraftForge/FML@53887ac59c Hacky interm solution to #1207 to buy me time to re-write FML's network protocol.
 2014-07-18 12:29:03 -07:00
Lex Manos
c69958e34b Made skulls respect Block.isReplaceable when placing, also prevented them from deleting blocks when placed at certain angels. Closes #1233 2014-07-16 18:37:49 -07:00
Lex Manos
b2dddf545b Fixed NPE that happens sometimes when exiting the game witout fully loading a world {main a dev-time thing} 2014-07-16 18:36:12 -07:00
Lex Manos
5f20829165 Updated FML: 
MinecraftForge/FML@9d40b76197 Don't scan ObjectHolders if there was an error already, derpitude will ensure.
MinecraftForge/FML@76538c1781 Add a terminal transformer and tweaker.
MinecraftForge/FML@aec9228845 Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit.
MinecraftForge/FML@908491d5e7 Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.
MinecraftForge/FML@d13295e281 Fix FMLAT manifest AccessTransformers, class loader fun!
 2014-07-16 16:52:18 -07:00
LexManos
20cac56bfb Merge pull request #1235 from darkhax/master 
Changed exception message for duplicate enchantment ids
 2014-07-16 10:10:28 -07:00
Darkhax
08826ed84b Changed exception message for duplicate enchantment ids to contain the 
class path for both enchantments along with the enchantmnet id that has
been duplicated.
 2014-07-16 07:08:57 -06:00
LexManos
06701348d6 Merge pull request #1232 from bspkrs/patch-3 
Fixed missing assignment of constructor arg (thanks @Lunatrius)
 2014-07-15 12:26:00 -07:00
bspkrs
e35755c3e3 Fixed missing assignment of constructor arg (thanks @Lunatrius) 
I must have edited this out when I was cleaning up my formatting commit spam.
 2014-07-15 09:47:01 -04:00
LexManos
e2fe13bd17 Merge pull request #1226 from williewillus/xporb 
Fix experience orbs spawning at 32x coordinates clientside
 2014-07-14 14:56:52 -07:00
Vincent Lee
a35457ecb7 Fix comment derp (+1 squashed commits) 
Squashed commits:

[52c40bc] Fix experience orbs spawning at 32x coordinates clientside

Add // FORGE comment

Add // FORGE comment to clarify the purpose of the change
 2014-07-14 16:43:16 -05:00
LexManos
79cda09594 Merge pull request #1225 from williewillus/master 
Fix chat opacity
 2014-07-14 13:11:09 -07:00
Vincent Lee
5c0217d316 Fix chat opacity 
Add // FORGE comment

As per convention, add // FORGE comment to clarify the purpose of the change
 2014-07-13 23:44:47 -05:00
Lex Manos
52ec4f7c57 Updated FML: 
MinecraftForge/FML@ab52901b8b Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
MinecraftForge/FML@11893fbbb7 Add system property to skip doing world backups when game registry changes. This is SEVERLY ill-advised, if you do this DO NOT ask for any support.
MinecraftForge/FML@fdb6b34b8f Update authlib and realms to latest json data.
MinecraftForge/FML@b3a74882b4 added slider controls for numerics. default control is textbox, but slider can be used as a custom list entry class. fixed constructor javadocs in GuiConfig
MinecraftForge/FML@7c6d1f7568 Merge pull request #468 from bspkrs/master
MinecraftForge/FML@692d955c1a Update tweaker login to use authlib.
MinecraftForge/FML@c2119eb1c1 Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
 2014-07-11 18:17:50 -07:00
Glassmaker
ff2696dff8 Adds getLocalizedName and getUnlocalizedName to FluidStack 2014-07-10 15:25:53 +03:00
cpw
27d5dc0a25 Add a system property for the stencil, in case config is not available.. 2014-07-09 10:59:33 -04:00
LexManos
01d0e6a481 Merge pull request #1213 from TheCountryGamer/master 
RenderBlockOverlayEvent patch
 2014-07-08 13:17:30 -07:00
TheCountryGamer
7adaef9aed RenderBlockOverlayEvent patch 
Fixes skewed XYZ parameters
 2014-07-08 15:49:32 -04:00
Lex Manos
195542c5fb Fixed Enchantment.addToBookList Closes #1160 2014-07-07 21:54:32 -07:00
Lex Manos
af9229d3bc Add ability for modders to designate custom biome types. And remove note about automatically registering. Closes #1167 2014-07-07 21:29:37 -07:00
LexManos
ba6c2c88ed Merge pull request #1194 from diesieben07/potion-icon 
Added hook for potion inventory icons
 2014-07-07 19:56:52 -07:00
LexManos
7d24c2259b Merge pull request #1199 from Adubbz/master 
Enhanced the Biome Dictionary
 2014-07-07 19:50:56 -07:00
LexManos
a6b7ba06c6 Merge pull request #1163 from TheCountryGamer/master 
Added RenderBlockOverlayEvent
 2014-07-07 19:50:04 -07:00
Lex Manos
f6471c3c08 Added World to ChunkProviderEvent.ReplaceBiomeBlocks, and exposed metadata to End and Nether generation events. Close #1201 2014-07-07 19:47:50 -07:00
Adubbz
8d2ebdf25f Enhanced the Biome Dictionary with tags based on temperature, vegetation, moisture, trees and others 2014-07-08 12:09:44 +10:00
Lex Manos
86ccfb1d68 Made EmeraldOre respect isReplaceableOreGen. Closes #1157 2014-07-07 18:55:24 -07:00
TheCountryGamer
7e7870026e Added RenderBlockOverlayEvent.java 
Adds a Forge event which controls whether an overlay is rendered.
Overlays include: First-person fire, Block (when inside a block)
	and water when a player is inside a water block.

Patched for easier manipulation of event

Fixed for Lex

To be squashed

Removed Contructor

Added block XYZ parameters

TODO, the second block overlay event’s XYZ might not be correct
 2014-07-07 21:49:51 -04:00
LexManos
53ce6f69e7 Merge pull request #1200 from tterrag1098/master 
Add AchievementEvent
 2014-07-07 18:37:53 -07:00
LexManos
81a791bac7 STENCIL buffer and DEPTH buffer, attempt a fix for GL errors. 2014-07-06 22:19:13 -07:00
LexManos
7c016d9ee8 Merge pull request #1210 from Ghosrec35/master 
Added Javadoc comments for Forge Event documentation.
 2014-07-06 17:16:46 -07:00
Lex Manos
5d82316059 MinecraftForge/FML@ac994e178a Scala people test your shit. 2014-07-06 17:14:25 -07:00