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

4463 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
14f7bb44d9 Make more noise when people screw up mod downloading and put .jar.zip in their mod folders. 2014-07-30 12:38:55 -02:30
zarathul
7a1de8c13d - Added drainFluidContainer() and getContainerCapacity() helper methods. 2014-07-30 13:23:52 +02:00
Christian
f8b5ae45f1 Make LogContext optional. This can be useful for debugging mod issues, but 
Apache's implementation in log4j2 is responsible for a very significant % of
the overall runtime. Quite frankly this is shockingly bad performance from
what is supposed to be a high performance logging framework. Anyway, until we
can figure out if we can fix it, we're turning it off by default.
 2014-07-29 21:48:14 -02:30
Christian
655d902195 And fix the read side too, incase someone is trying to bitbang and failing. 2014-07-29 21:36:44 -02:30
Christian
03174602f6 If an IO exception comes from the datawatcher, spew it all over the console 
don't discard it silently. Should stop pixelmon blaming forge for their mistakes.
 2014-07-29 21:33:19 -02:30
Christian
522b648185 Merge branch 'std-redir' of github.com:Emberwalker/FML 2014-07-29 14:49:42 -02:30
Christian
6819f5d45d Update realms to 1.3.2 2014-07-29 14:24:41 -02:30
Christian
0de92f4db7 Clean up a bunch of compiler warnings. 2014-07-29 14:11:41 -02:30
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
bspkrs
09d68fb7bd added support for \n in tooltip strings 
added \n test tooltip localization
fixed int/double conversion error in slider entry
added test slider scenario that highlighted conversion error
 2014-07-24 16:51:15 -04:00
skyboy
906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
cpw
5643237fb9 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets 
into the map, rather than force overwriting. Fixes skyboy's comment.
 2014-07-20 10:46:22 -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
4ba024ca2e Hacky interm solution to #475 to buy me time to re-write FML's network protocol. 2014-07-18 12:25:02 -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
Lex Manos
4ed75fd963 Fix FMLAT manifest AccessTransformers, class loader fun! Closes #477 2014-07-16 00:24:03 -07: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
Lex Manos
59c628f777 Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems. 2014-07-14 13:53:37 -07: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
b1ec7b420c Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit. 2014-07-12 17:20:01 -07:00
cpw
87dde51b8d Add a terminal transformer and tweaker. 2014-07-12 17:37:41 -04:00
cpw
e8c251808b Don't scan ObjectHolders if there was an error already, derpitude will ensure. 2014-07-12 12:03:34 -04: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
Lex Manos
e6e019896f Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working. 2014-07-11 17:56:07 -07:00
Lex Manos
7cd70b3f26 Update tweaker login to use authlib. 2014-07-11 17:52:43 -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
d4d562c1ca Merge pull request #468 from bspkrs/master 
Added slider controls for numerics. Default control is textbox, but slider can be used as a custom list entry class.
 2014-07-07 20:15:10 -07:00
bspkrs
e57223a676 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
 2014-07-07 23:01:56 -04: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