Commit Graph

  • dca8a4a550 Merged FML @ 1.7.10 v7.99 v11.0.0 cpw 2015-05-13 20:00:48 -04:00
  • cb6f92e3c7 Merged FML v99.99 rm cpw 2015-05-11 18:46:21 -04:00
  • 081a949bfd Merge branch '1.7.10' cpw 2015-05-10 23:55:11 -04:00
  • 1f679be553 Merge pull request #1863 from Tmtravlr/master LexManos 2015-05-10 16:04:07 -07:00
  • b2de64bc70 Initialized the Nether Fortress chest loot Tmtravlr 2015-05-10 01:11:27 -07:00
  • 228ce68639 Update current json cpw 2015-05-08 13:54:11 -04:00
  • 4270f0fb4a MinecraftForge/FML@0b84b6aa29 Expose the state of the loader cpw 2015-05-07 14:24:14 -04:00
  • dd49a0cd84 Merge branch '1710ls' into 1.7.10 cpw 2015-05-07 14:23:37 -04:00
  • 76c7177553 Expose the state of the loader cpw 2015-05-07 14:17:45 -04:00
  • 7ab952d410 Merge pull request #1853 from Silfadur/master Fry 2015-05-05 04:22:01 +03:00
  • b756bd5f9a Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI Silfadur 2015-05-05 02:23:38 +02:00
  • 88a7c0b233 Updated FML: MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore. MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack MinecraftForge/FML@91338433fa Add classloader exclusion for ASM MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes MinecraftForge/FML#651 MinecraftForge/FML@8ccfa24764 Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10 MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen. MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now. MinecraftForge/FML@dda4313539 Revert "Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. MinecraftForge/FML@5dbb481732 Eliminated texture name allocation race condition MinecraftForge/FML@450b82ca0e Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed RainWarrior 2015-05-04 22:18:38 +03:00
  • c28794fe38 Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed RainWarrior 2015-05-04 22:10:36 +03:00
  • fb18c07722 Eliminated texture name allocation race condition RainWarrior 2015-05-04 21:53:39 +03:00
  • 1b1fbbb70d MinecraftForge/FML@dda4313539 Revert "Merge pull request #650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. cpw 2015-05-04 09:26:09 -04:00
  • 65ab79cf69 Revert "Merge pull request #650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. cpw 2015-05-04 08:49:46 -04:00
  • 815b97bf7c MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack MinecraftForge/FML@91338433fa Add classloader exclusion for ASM MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes #651 MinecraftForge/FML@8ccfa24764 Merge pull request #650 from luacs1998/1.7.10 MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen. MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now. cpw 2015-04-25 15:07:11 -04:00
  • c43e4a8022 Fix the ordering of the messages, so they make sense now. cpw 2015-05-02 22:13:41 -04:00
  • a003d1b360 Merge pull request #1843 from Zaggy1024/getlightvaluefix LexManos 2015-05-01 17:58:30 -07:00
  • ee003ef77e Fixed a bug which caused the light level not to update when a block implements Block.getLightValue(IBlockAccess, BlockPos) to change the light value for different block states. Zaggy1024 2015-05-01 17:10:08 -05:00
  • 4e8d5255ed Merge pull request #652 from AbrarSyed/patch-2 LexManos 2015-04-29 14:45:59 -07:00
  • 8e14f9e1cc remapped parameters and added ending newlines AbrarSyed 2015-04-29 13:37:09 -05:00
  • 858c64ffd3 Optifine can tell us when they're ready for the new splash screen. cpw 2015-04-29 08:15:35 -04:00
  • fd8c2ba08c Merge pull request #650 from luacs1998/1.7.10 LexManos 2015-04-27 15:30:09 -07:00
  • 1aacf9cfe2 Merge pull request #649 from luacs1998/master LexManos 2015-04-27 15:29:34 -07:00
  • ddc6b0a19f Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes #651 cpw 2015-04-26 10:22:48 -04:00
  • 0c933be8dd Add classloader exclusion for ASM luacs1998 2015-04-26 20:40:22 +08:00
  • aad4678d40 Add classloader exclusion for ASM luacs1998 2015-04-26 20:14:35 +08:00
  • c6525cb3f3 Merge pull request #1832 from Parker8283/lhsf-1.8 LexManos 2015-04-25 17:21:30 -07:00
  • 083e4758a4 Merge pull request #1831 from Zaggy1024/clientonlyrenderinlayer LexManos 2015-04-25 17:00:37 -07:00
  • 9a7c20e791 Fixes MC-52974: Host's skin doesn't load in LAN Parker Young 2015-04-25 19:58:24 -04:00
  • 2589a0d1f6 Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer. Zaggy1024 2015-04-25 18:04:56 -05:00
  • 626a192ce6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack RainWarrior 2015-04-26 00:11:29 +03:00
  • 37075d0437 MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore. cpw 2015-04-25 15:06:20 -04:00
  • 46c5505565 Splash progress screen will not load in the presence of optifine anymore. cpw 2015-04-25 15:05:28 -04:00
  • 63e71af229 MinecraftForge/FML@94821fac98 Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json cpw 2015-04-25 01:34:25 -04:00
  • 89daceb9eb Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json cpw 2015-04-25 01:30:17 -04:00
  • 66a4db5fa0 MinecraftForge/FML@4fe7b469b5 Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now. MinecraftForge/FML@31ae43590a Fix trying to close the screen during error. cpw 2015-04-25 00:47:09 -04:00
  • 4e6aa905f0 Fix trying to close the screen during error. cpw 2015-04-25 00:41:50 -04:00
  • 794ff1d1b4 Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now. RainWarrior 2015-04-25 05:12:02 +03:00
  • 55cbba0764 MinecraftForge/FML@36688e781a Add in resource reloading to the bar. Tidy up some of the labels a bit. MinecraftForge/FML@a1dc465a55 More progress bar action! MinecraftForge/FML@bfcbf4ef43 More progress bar hooks MinecraftForge/FML@a6670c415e Thread errors should be correctly displayed in the crash report now MinecraftForge/FML@9a16d26186 fixed bar text positioning MinecraftForge/FML@0059c63028 Track mipmaps and texture upload MinecraftForge/FML@ef5f809752 Fix broken log message in vanilla. cpw 2015-04-24 19:16:55 -04:00
  • 1fdd18398e Fix broken log message in vanilla. cpw 2015-04-24 19:02:54 -04:00
  • 454e2e36a4 Track mipmaps and texture upload cpw 2015-04-24 19:01:49 -04:00
  • 753115678a fixed bar text positioning RainWarrior 2015-04-25 01:37:39 +03:00
  • c8acd763ef Thread errors should be correctly displayed in the crash report now RainWarrior 2015-04-25 01:27:57 +03:00
  • 3d03b31d00 More progress bar hooks cpw 2015-04-24 17:47:39 -04:00
  • d18d493174 More progress bar action! cpw 2015-04-24 17:11:49 -04:00
  • ab3413a31e Add in resource reloading to the bar. Tidy up some of the labels a bit. cpw 2015-04-24 16:00:22 -04:00
  • 591971936d Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824 Lex Manos 2015-04-23 23:46:55 -07:00
  • a297a615b9 MinecraftForge/FML@5785a9c9e8 Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645 MinecraftForge/FML@bd117be9c3 Correctly track exceptions thrown in the loading screen rendering thread RainWarrior 2015-04-24 05:51:44 +03:00
  • 53a21e7e47 Correctly track exceptions thrown in the loading screen rendering thread RainWarrior 2015-04-24 05:38:32 +03:00
  • 68def9c352 Merge pull request #647 from AbrarSyed/patch-1 LexManos 2015-04-23 18:55:27 -07:00
  • 99c60ee156 fixed scala module libs in jsons AbrarSyed 2015-04-23 20:54:14 -05:00
  • 3f59b560d7 Merge pull request #1814 from Lunatrius/block-dispatcher LexManos 2015-04-22 13:25:48 -07:00
  • ea9d805e4f Extracted the creation of RegionRenderCache into a method. Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc). Lunatrius 2015-04-19 23:13:16 +02:00
  • 87e6c29028 Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645 cpw 2015-04-22 08:31:25 -04:00
  • c12bb689fb MinecraftForge/FML@a39482c4b7 Splash screen implementation MinecraftForge/FML@01fea095cd Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10 MinecraftForge/FML@364b4bbbb0 Call some loader stuffs MinecraftForge/FML@61a891280d Make sure to close the splash screen if there's gonna be an error display cpw 2015-04-21 00:30:52 -04:00
  • ba354da317 Make sure to close the splash screen if there's gonna be an error display cpw 2015-04-21 00:28:19 -04:00
  • 6398961c48 Call some loader stuffs cpw 2015-04-20 23:34:36 -04:00
  • 8c54026f2d Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10 cpw 2015-04-20 23:15:37 -04:00
  • 5b06b71d04 Splash screen implementation RainWarrior 2015-04-21 04:42:59 +03:00
  • 50215307f2 MinecraftForge/FML@d14d1a8fea Update to use the inherited jar format. Simplifies a lot.. cpw 2015-04-20 22:27:10 -04:00
  • b049b39760 Update to use the inherited jar format. Simplifies a lot.. cpw 2015-04-20 16:14:27 -04:00
  • 96cbadb874 Expose the fluid that a block was constructed with, useful for 'non-default' configuration of fluidblocks. Shouldn't be used outside of this purpose. cpw 2015-04-20 10:29:04 -04:00
  • 50608986fe Replace the OLD fluid in the fluidID map, not the new one.. cpw 2015-04-20 10:01:36 -04:00
  • 7bbe8df2b8 Fix static initializer derp. cpw 2015-04-20 09:26:27 -04:00
  • 0543828603 Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present. cpw 2015-04-20 09:06:23 -04:00
  • 7e9d2fb509 Reformat ItemArmor$ArmorMaterial.getBaseItem to use an if/then/else structure. The switch causes the generation of an internal class which may derp custom armor addition. Closes #1799 cpw 2015-04-19 12:04:22 -04:00
  • dcb2f2588c Actually use the override constraint in ticket requests. Closes #1802 cpw 2015-04-19 11:57:39 -04:00
  • 178acfbb20 Change logging to avoid the String.format bug. Closes #1809 cpw 2015-04-19 11:52:23 -04:00
  • 57408af2a3 MinecraftForge/FML@8f9e3a7e30 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638 cpw 2015-04-18 21:54:01 -04:00
  • e1ed3c07c2 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638 cpw 2015-04-18 21:48:49 -04:00
  • 54af750717 Verify that the fluid registry doesn't contain "junk" fluids thru reflection. cpw 2015-04-18 21:37:45 -04:00
  • 1effc27790 Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker. Lex Manos 2015-04-17 02:07:01 -07:00
  • de066a86da Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker. Lex Manos 2015-04-17 02:07:01 -07:00
  • 61984561cd Merge pull request #1805 from KingLemming/1.7.10 KingLemming 2015-04-16 17:20:43 -04:00
  • cd3bbfb02c Adds some new Ore querying functionality. King Lemming 2015-04-16 17:18:37 -04:00
  • 81ab4cbc5f Added LivingExperienceDropsEvent to change the amount of experience an entity drops Lumien 2015-04-14 00:09:42 +02:00
  • c5f22f56d8 Dissallow color codes in mod names displayed in Mod gui list. And code formatting. Lex Manos 2015-04-13 21:52:53 -07:00
  • 475d7fc02d Revert KL's change, requesting a ore WILL register it. LexManos 2015-04-13 21:28:16 -07:00
  • b30b551197 Merge pull request #1796 from KingLemming/1.7.10 KingLemming 2015-04-13 22:41:25 -04:00
  • 3cd7f6bd87 Adjusts OreDictionary to prevent invalid registrations. Getting Ore Names for a non-existent ore will no longer automatically add that Name to the list nor generate an ID. King Lemming 2015-04-13 22:40:38 -04:00
  • 5a5ef86da9 Merge pull request #636 from tterrag1098/betterModList LexManos 2015-04-13 17:13:52 -07:00
  • 3fbd6b0810 Fix control codes being used for mod list sort. Clean up sorting code and fix a bug with right click clearing. tterrag1098 2015-04-12 00:51:03 -04:00
  • 5ac654dc1c MinecraftForge/FML@888e489394 Allow registering custom language adapters. MinecraftForge/FML@906f94ca14 Some tidyup of the PR MinecraftForge/FML@1c025f1843 Patch TracingPrintStream to handle Kotlin IO. cpw 2015-04-11 18:21:50 -04:00
  • 277495c8e4 MinecraftForge/FML@dfce4cd8d0 Allow registering custom language adapters. MinecraftForge/FML@9fecd72cf0 Some tidyup of the PR MinecraftForge/FML@10ac2a4fd9 Fix itemCtorArgs javadoc in registerBlock MinecraftForge/FML@86f70d37a4 Patch TracingPrintStream to handle Kotlin IO. cpw 2015-04-11 18:20:11 -04:00
  • 5f7c3bd72d Patch TracingPrintStream to handle Kotlin IO. Arkan Emberwalker 2015-04-10 14:17:27 +01:00
  • 6cdde0f9e4 Patch TracingPrintStream to handle Kotlin IO. Arkan Emberwalker 2015-04-10 14:17:27 +01:00
  • 592c9c8e42 Fix itemCtorArgs javadoc in registerBlock tterrag1098 2015-04-06 19:17:58 -04:00
  • 4af2ba3949 Some tidyup of the PR cpw 2015-04-11 18:02:00 -04:00
  • 0055973f43 Allow registering custom language adapters. Arkan Emberwalker 2015-04-11 17:36:16 +01:00
  • 1fa358ccee Some tidyup of the PR cpw 2015-04-11 18:02:00 -04:00
  • 5c88164211 And handle the null case in the constructor itself. Closes #1794 (again) cpw 2015-04-11 17:38:15 -04:00
  • 230d757a89 Fix NPE - Closes #1794 cpw 2015-04-11 17:27:14 -04:00
  • 9671179453 Fluids are now tracked internally by mod. This allows for the server and the world to specify a "default" in the case of a possible alternative fluid implementation. If you always called registerFluid, things should work pretty seamlessly, but if you didn't (gating with an isFluidRegistered check for example) you should change to register anyway. This way, even if you're not default in the overall instance, you may become default if you're the only mod present on a server, for example, or in a world save. cpw 2015-04-11 17:18:53 -04:00
  • 2b3cdaa752 Allow registering custom language adapters. Arkan Emberwalker 2015-04-11 17:36:16 +01:00
  • eb12936a52 MinecraftForge/FML@0da1263ff9 Enhance error output for bad textures a bit more and try and capture more types of error.. cpw 2015-04-11 12:30:20 -04:00
  • fa5ab52acd Enhance error output for bad textures a bit more and try and capture more types of error.. cpw 2015-04-11 12:12:37 -04:00
  • 345d905438 MinecraftForge/FML@be5ec06e31 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable format. cpw 2015-04-11 01:03:50 -04:00
  • c7622c06d7 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable format. cpw 2015-04-11 00:31:09 -04:00