Commit Graph
7649 Commits
Author SHA1 Message Date
Lex Manos 6f693206de Add ability for creative tabs that have search bars to customize the text box's width, and prevent the default set of enchanted books from being displayed in those tabs. Closes #1303 Closes #1301 2014-08-11 19:18:38 -07:00
LexManos 948f7145d1 Merge pull request #1187 from Abastro/skylight
Skylight Hooks for Minecraft Forge
2014-08-11 16:00:11 -07:00
Abastro f590ce8641 Skylight Hooks for Minecraft Forge
Mainly for solar/lunar eclipse.
2014-08-11 15:42:07 +09:00
LexManos 261ba628df Merge pull request #1217 from Glassmaker/patch-1
Adds getLocalizedName and getUnlocalizedName to FluidStack
2014-08-10 01:42:24 -07:00
LexManos 12d4047459 Merge pull request #484 from bspkrs/master
Added support for \n in GuiConfig tooltip strings + a slider fix
2014-08-07 14:41:51 -07:00
zlyfire ce8882e89c Update README.txt
Add in reference to running setupDecompWorkspace to get decompiled classes
2014-08-06 16:29:34 -04:00
LexManos 98285e4df6 Merge pull request #1297 from ShetiPhian/patch-1
Legacy Liquid Load Fix
2014-08-05 19:47:58 -07:00
ShetiPhian 22609b1d54 Legacy Liquid Load Fix
nbt.getString("FluidName") no longer returns null, it returns an empty string.

This patch allows legacy liquids to be resolved once again.
2014-08-05 21:08:53 -04:00
Lex Manos 5131aed7bd Fix metadata for every permutation -.- Closes #1294 2014-08-05 15:18:02 -07:00
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
AntonBoch1244 e5fe05a1cd Build.Gradle Patch
Changing assetDir to runDir and set runDir to "eclipse"
2014-08-05 22:08:58 +04: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
Christian 269080fee5 FML now supports passing a json formatted modlist as an argument, as well as a comma separated argument list.
These facilitate modpacks mostly, by meaning you don't need to duplicate mods. The modlist is arranged in the
maven style, with mods referenced maven-like.
2014-08-01 22:18:50 -02:30
Christian d21f8f6dbd Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs. 2014-08-01 21:43:53 -02:30
Christian 07466ab036 First draft of add alias. It is probably not properly persistent atm. 2014-08-01 21:07:03 -02:30
Christian 7ee877a567 Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within. 2014-08-01 21:07:02 -02:30
rwtema eeb701cb16 Fixed ItemFluidContainer always draining the maximum amount, regardless of the amount remaining. 2014-07-31 20:52:52 +01:00
cpw 2c804c9b44 Update README.txt 2014-07-31 11:00:53 -02:30
Christian 8622b3fde9 Add a constructor to CustomModLoadingDisplayException. Closes #387 2014-07-31 10:46:33 -02:30
Christian 2d37b14555 AllowPlayerLogins only after the server has completed the core init tasks. Closes #372 2014-07-31 10:17:11 -02:30
Christian 0607bffb92 Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313 2014-07-31 10:02:47 -02:30
Christian f649eccc51 Default collections, so that we don't crash if useDependencyInfo is true. Closes #485 2014-07-31 09:53:27 -02:30
Christian fe29a98c62 Fix nested directory for language resources. Closes MinecraftForge#1264 2014-07-31 09:48:03 -02:30
Christian 0c088a4299 Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync. 2014-07-31 09:47:35 -02:30
Christian f5bcb6f0ca Add a delegate to every item and block. this should help with renaming fun stuffs. Also, fix all the tabs from my previous commits. *sigh* 2014-07-30 21:18:31 -02:30
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
Christian 7ac077ed36 Add a custom version range factory method. Should hush skyboy's complaints. Closes #486 2014-07-30 16:46:16 -02:30
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