From 2b40a5e3ce8d721ace2a7f41397735b5230ee4c1 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 7 Apr 2014 10:01:56 -0700 Subject: [PATCH] Small wording change in license to allow for specifc differnet licnense contributions. Updated FML: MinecraftForge/FML@e58562d3edfd1cd37fdc0a9e54181aed7433fdff Fix remaining issue with autoassigned Block and Item IDs overlapping. MinecraftForge/FML@a82195772e539437911c25508168cb607659bc71 Registry: Block IDs after failing to find a mapping for them MinecraftForge/FML@fd9389015fd5c6150155531bf1fffb38cfe9d551 Fix FMLMissingMappingsEvent.get MinecraftForge/FML@5eebd4df718d65ac8426deba61e1ebb6ae2fde18 Registry: Implement support for remapping blocks/items to a new name. MinecraftForge/FML@7325aa5033e7a5b5db79340777dd7a1c763315a0 Registry: cleanup, fix missing id error GUI formatting MinecraftForge/FML@eb29d651ebda7086fe6d1f716295b087e2c17e6f Fix old 1.7 worlds with broken ID mappings MinecraftForge/FML@6fd3c12a4a15a5cf38c421a94576a5cacd3fb7c1 Registry: allow handling missing blocks/items regardless of the mod id MinecraftForge/FML@038fa17ad33aeba276db84ab170504fce884c1e7 Merge branch 'master' of https://github.com/MinecraftForge/FML MinecraftForge/FML@49c623f59c440ba177adf2d76332ecee25e12236 initial attempt at a better way to ask the user in case of startup issues MinecraftForge/FML@9be92dcfcb1c737025397c92b18ed027a6c7f4fa Registry: Complain about bogus registrations MinecraftForge/FML@fd6d55afcc4f4c650c143ad43e09fbdc2cb9d850 Registry: Allow ignoring missing mods from the GUI, with confirm+backup Registry: Add confirm+backup for automated corrupted id table fixup Require the user to confirm loading from a backup level.dat MinecraftForge/FML@c47fc3b382434d435050b4ee02a02550b81f5717 Enable custom gui rendering only as required MinecraftForge/FML@f77632df35dbf53fb31420fa86e6792f13257020 Remove unneeded entity spawn debug logging. MinecraftForge/FML@c7adb42199a0684d8748451d39deb8326c0a2194 Registry: Repair mismatched ItemBlocks as well Fix a few misc issues MinecraftForge/FML@c8a245a985779fd2545ee4b58a93270973aeb435 Registry: Fix debug info MinecraftForge/FML@c8a0b72eba9265be608670424e1bd835a9d2f1e2 Registry: Complain about missing mods when repairing broken worlds Registry: Reduce console spam MinecraftForge/FML@8e44006f432f1b36b826ff0469d99986a6051e4b Registry: Protect against putObject misuse, handle duplicate registrations better MinecraftForge/FML@294c93212cd9f30c50b9d1a3b048a6141c45cdea Registry: Add support for registering ItemBlocks before their Blocks MinecraftForge/FML@3b42b33b6ec4020b5032cae06760053ed135fae8 Merge pull request #400 from sfPlayer1/master --- MinecraftForge-License.txt | 6 +++--- fml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MinecraftForge-License.txt b/MinecraftForge-License.txt index 3f20310bb..1cc2a3e9d 100644 --- a/MinecraftForge-License.txt +++ b/MinecraftForge-License.txt @@ -24,9 +24,9 @@ the Minecraft sources that are required to have Minecraft Forge working. 1. Scope -------- -The present license is granted to any user of Minecraft Forge. As a -prerequisite, a user of Minecraft Forge must own a legally aquired copy of -Minecraft +The present license is granted to any user of Minecraft Forge, for all files included +unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft +Forge must own a legally aquired copy of Minecraft. 2. Play rights -------------- diff --git a/fml b/fml index 58a4095f5..3b42b33b6 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 58a4095f56930cb27f7a06db5409ca7d570761cd +Subproject commit 3b42b33b6ec4020b5032cae06760053ed135fae8