Player 038fa17ad3 Merge branch 'master' of https://github.com/MinecraftForge/FML ...

Conflicts:
	src/main/java/cpw/mods/fml/client/FMLClientHandler.java
	src/main/java/cpw/mods/fml/client/GuiModItemsMissing.java
	src/main/java/cpw/mods/fml/common/FMLContainer.java
	src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
	src/main/java/cpw/mods/fml/common/registry/GameData.java

2014-04-01 07:00:20 +02:00

..

registry

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

CustomModLoadingErrorDisplayException.java

First pass : kill modloader, clean up warnings

2013-11-10 11:49:06 -05:00

ExtendedServerListData.java

SSP Worlds updating from 1.6 will now pop a warning message before loading, and will capture a timestamped

2014-01-18 22:25:35 -05:00

FMLClientHandler.java

Merge branch 'master' of https://github.com/MinecraftForge/FML

2014-04-01 07:00:20 +02:00

FMLConfigGuiFactory.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

FMLFileResourcePack.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

FMLFolderResourcePack.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiAccessDenied.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiBackupFailed.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiCustomModLoadingErrorScreen.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiDupesFound.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiIngameModOptions.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiModItemsMissing.java

Merge branch 'master' of https://github.com/MinecraftForge/FML

2014-04-01 07:00:20 +02:00

GuiModList.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiModOptionList.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiModsMissing.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiModsMissingForServer.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiOldSaveLoadConfirm.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiScrollingList.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiSlotModList.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiSortingProblem.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

GuiWrongMinecraft.java

updated for ForgeGradle 1.2

2014-03-19 02:15:53 -05:00

IModGuiFactory.java

Tweaks

2014-01-02 22:18:02 -05:00