Commit graph

63 commits

Author SHA1 Message Date
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
cpw
2c24c7618a Mods that are extracted to the mods dir by unzipping or whatever will now cause the game to crash. Too much info is in the META-INF now,
and more will be being added. Extracting to the mods dir just completely breaks that.
2015-06-20 14:47:55 -04:00
Lex Manos
2bb090bf2b Force netty downgrade on dedicated server to match client. Netty bug: https://github.com/netty/netty/issues/2302 Closes #1848 2015-05-26 19:20:46 -07:00
cpw
081a949bfd Merge branch '1.7.10'
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
	src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
	src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
	src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
	src/main/java/net/minecraftforge/fml/common/LoadController.java
	src/main/java/net/minecraftforge/fml/common/Loader.java
	src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
	src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
	src/main/resources/fml_at.cfg
2015-05-10 23:55:11 -04:00
cpw
228ce68639 Update current json 2015-05-08 13:54:11 -04:00
cpw
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
2015-04-26 11:32:28 -04:00
AbrarSyed
99c60ee156 fixed scala module libs in jsons 2015-04-23 20:54:14 -05:00
cpw
6398961c48 Call some loader stuffs 2015-04-20 23:34:36 -04:00
cpw
b049b39760 Update to use the inherited jar format. Simplifies a lot.. 2015-04-20 22:25:29 -04: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
1b587948f8 Add joptsimple as a server required library. Closes #531 2014-10-01 11:26:06 -07: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
Lex Manos
6192119682 Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime. 2014-09-08 17:50:46 -07:00
cpw
bd8bd65ca1 Update for launchwrapper 1.11. Fixes java 6 compatibility. 2014-08-20 23:02:27 -04:00
cpw
2ca75b3fa4 Update to legacylauncher 1.10 and asm 5.0.3 2014-08-16 13:21:07 -04:00
Christian
6819f5d45d Update realms to 1.3.2 2014-07-29 14:24:41 -02:30
Lex Manos
e6e019896f Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working. 2014-07-11 17:56:07 -07:00
Lex Manos
2d56512ab2 Update authlib and realms to latest json data. 2014-07-07 17:25:37 -07:00
Lex Manos
e7087fcc48 Scala people test your shit. 2014-07-06 17:12:58 -07:00
cpw
920fd866b4 Merge branch 'scalaupdate' 2014-07-06 10:05:51 -04:00
cpw
efdbdea99f Update realms to 1.2.9 2014-07-06 10:05:34 -04:00
Soaryn
79e6167d8d Updated Scala to latest stable
Updates the -dev portion of the json files for 1.7.10 for scala 2.11.1
Updates the -rel portion of the json files for 1.7.10 for scala 2.11.1
2014-07-05 22:54:58 +03:00
cpw
8afc9c465c Update for release 1.7.10 2014-06-26 14:48:46 -04:00
cpw
7cafaed696 Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the
mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are
available at mojang, so we can update the json.
2014-06-25 18:28:50 -04:00
cpw
88a411550a Add support for mod access transformers without a coremod requirement.
Use the "FMLAT" manifest attribute, with a space separate list of files
that live in the 'META-INF' directory. They should conform to standard AT
formatting.
2014-06-24 21:34:07 -04:00
Christian
ea89e1a3f7 Pre4 update 2014-06-21 21:13:22 -04:00
Christian
be7cf8c01e Checking in pre3 work 2014-06-12 21:13:26 -04:00
Christian
3885f9bf84 First draft 1.7.9 support.
This is not modding minecraft. It's performing an update. Go away!
2014-05-17 16:30:13 -04:00
Christian
a7c15e30aa I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated.. 2014-04-19 10:46:04 -04:00
Lex Manos
5e4ddab6ba Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:02:47 -08:00
Christian
a80409c59a Add in the tweakclass, fix the json for lzma @ the server. 2013-12-30 13:06:59 -05:00
Lex Manos
f4fc6377b3 Add 1.7.2 base json, Gradle will automatically download updated versions of this. Keeping it in the repo allows us to see what base json we have built our jsons off of. And if it changes update accordingly. 2013-12-23 22:36:47 -08:00
Christian
61c6980105 bump to legacy launcher 1.9 with logging unification stuffs. 2013-12-18 11:15:53 -05:00
Christian
1533d88ef8 Fix the exc file. Fix the deobfremapper for handling inner classes. 2013-12-11 22:54:51 -05:00
Christian
f10969e3aa Pass 1: Most patches are restored.
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
2013-12-02 23:48:26 -05:00
Abrar Syed
43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Lex Manos
7e53a294fe Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:47:32 -07:00
Christian
952d602f49 Update for launchwrapper 1.8 2013-09-25 16:40:59 -04:00
Christian
74b7cba492 Update for MC 1.6.4 2013-09-20 16:25:12 -04:00
Christian
12c556bc36 Update for pre-ninja 1.6.3 update 2013-09-18 16:33:11 -04:00
Christian
56bf94b441 Update for new installer and thank you. 2013-09-17 21:56:25 -04:00
Christian
466902654e Add in support for using a mirror list and provide checksums for packed download of libs 2013-09-15 22:58:39 -04:00
Christian
4eb97daac3 Fix up scala refs, for better results 2013-08-18 18:58:36 -04:00
LexManos
f872ac0a90 Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:21:26 -07:00
LexManos
3dd0b5d496 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala. 2013-07-11 15:24:54 -07:00
Christian
e33a1a02bf Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm
library at dev time, since it contains full symbols and code in compiled form.
2013-07-10 15:47:13 -04:00
LexManos
f45499612d Add MC Version to installed version name. 2013-07-09 03:27:01 -07:00
Christian
ab3220cbb3 Add the jsons for 1.6.2 2013-07-07 16:05:53 -04:00
LexManos
0b1fdde35d Fix eclipse workspaces and launch configurations. 2013-07-03 18:22:57 -07:00