cpw
|
16ff1be093
|
Merge branch '1.7.10'
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
|
2015-06-21 21:59:51 -04:00 |
|
AbrarSyed
|
99c60ee156
|
fixed scala module libs in jsons
|
2015-04-23 20:54:14 -05:00 |
|
Lex Manos
|
7b2e7ac3c9
|
Unlink banner block and item id. Mojang should of matched these up but they didn't -.-
|
2014-12-01 18:00:28 -08:00 |
|
Lex Manos
|
28ff001cc0
|
Move FML to net.minecraft.fml package.
|
2014-09-22 22:50:54 -07:00 |
|
Lex Manos
|
ebb91ba280
|
1.8 Conf update. Uses MCPData Snapshots now.
|
2014-09-18 17:57:33 -07:00 |
|