keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Small wording change in license to allow for specifc differnet licnense contributions. 

Updated FML:
MinecraftForge/FML@e58562d3ed Fix remaining issue with autoassigned Block and Item IDs overlapping.
MinecraftForge/FML@a82195772e Registry: Block IDs after failing to find a mapping for them
MinecraftForge/FML@fd9389015f Fix FMLMissingMappingsEvent.get
MinecraftForge/FML@5eebd4df71 Registry: Implement support for remapping blocks/items to a new name.
MinecraftForge/FML@7325aa5033 Registry: cleanup, fix missing id error GUI formatting
MinecraftForge/FML@eb29d651eb Fix old 1.7 worlds with broken ID mappings
MinecraftForge/FML@6fd3c12a4a Registry: allow handling missing blocks/items regardless of the mod id
MinecraftForge/FML@038fa17ad3 Merge branch 'master' of https://github.com/MinecraftForge/FML
MinecraftForge/FML@49c623f59c initial attempt at a better way to ask the user in case of startup issues
MinecraftForge/FML@9be92dcfcb Registry: Complain about bogus registrations
MinecraftForge/FML@fd6d55afcc 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@c47fc3b382 Enable custom gui rendering only as required
MinecraftForge/FML@f77632df35 Remove unneeded entity spawn debug logging.
MinecraftForge/FML@c7adb42199 Registry: Repair mismatched ItemBlocks as well Fix a few misc issues
MinecraftForge/FML@c8a245a985 Registry: Fix debug info
MinecraftForge/FML@c8a0b72eba Registry: Complain about missing mods when repairing broken worlds Registry: Reduce console spam
MinecraftForge/FML@8e44006f43 Registry: Protect against putObject misuse, handle duplicate registrations better
MinecraftForge/FML@294c93212c Registry: Add support for registering ItemBlocks before their Blocks
MinecraftForge/FML@3b42b33b6e Merge pull request #400 from sfPlayer1/master
This commit is contained in:
Lex Manos 2014-04-07 10:01:56 -07:00
parent ae81ad58ea
commit 2b40a5e3ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MinecraftForge-License.txt
View File

@ -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
--------------

2
fml

@ -1 +1 @@
Subproject commit 58a4095f56930cb27f7a06db5409ca7d570761cd
Subproject commit 3b42b33b6ec4020b5032cae06760053ed135fae8