Commit Graph

924 Commits

Author SHA1 Message Date
Christian 2e269c967a Clean up more junk 2013-02-26 00:28:12 -05:00
Christian b5ba054fe5 Update libs for 1.5. Lots of new libs. 2013-02-26 00:16:57 -05:00
Christian 939bf833b3 Fix renderengine patch *sigh* 2013-02-25 22:06:20 -05:00
Christian 22831e6b63 Merge branch 'master' into snapshot15
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
2013-02-25 21:53:56 -05:00
Christian c056f49796 Merge branch 'master' into snapshot15
Conflicts:
	client/cpw/mods/fml/client/TextureFXManager.java
2013-02-25 21:18:08 -05:00
cpw 53855cc96b Merge pull request #188 from immibis/master
Console log thread should be a daemon thread.
2013-02-22 22:35:14 -08:00
immibis 75c1dc1091 Console log thread should be a daemon thread. 2013-02-23 19:27:16 +13:00
LexManos 604e81a323 Fix sprite map issue. 2013-02-22 14:45:25 -08:00
Christian 4cafd6c627 Fix Language Registry, closes #163 2013-02-17 16:28:54 -05:00
LexManos bd25e14545 Option to disable renaming for srgnames. 2013-02-08 14:50:17 -08:00
Christian ae58a0dbe3 Fix HD mob skins, FINALLY!!!
Stupid eyes are stupid.
2013-02-06 01:25:46 -05:00
Christian 06eea87b71 Fix up mistake that broke all modloading. Nice. 2013-02-04 10:58:48 -05:00
Christian 11f226e813 Fix some class naming and packaging issues, pending an MCP update
for the same
2013-02-02 10:54:48 -05:00
Christian 92a377a4e8 Update for MCP 7.34 and MC 13w05b 2013-02-01 23:05:23 -05:00
Christian 74043f515f MCP compilation works 2013-02-01 22:42:28 -05:00
Christian 3101006e58 IMC tweaks: runtimeMessages now work (thanks for all that testing for this much requested feature!)
and IMCEvent will no longer remove messages if no one gets them, so you can do
just manual runtime polling, if you wish.
2013-01-31 13:39:53 -05:00
Christian 46ccfb235d More logging tweaks. You can probably configure individual mod log files if you wish now 2013-01-30 20:55:12 -05:00
Christian 0c6019da8f A log of logging cleanup. FML will now read logging.properties to configure logging channels a couple of times during startup.
You should be able to filter a lot of messages based on things like modid and certain FML related features that can be noisy
like item tracking.
Should close #175
2013-01-30 18:57:21 -05:00
Christian 5c99e3488a Try and handle "death on startup" a bit cleaner 2013-01-27 15:54:36 -05:00
Christian c19646421a Deprecate the old GUI ticktype. They're dead and have been for some time. 2013-01-24 17:29:46 -05:00
Christian 3dbffd1754 Tweak a method signature 2013-01-24 10:23:36 -05:00
LexManos d9db242f4c Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling server. 2013-01-24 03:08:19 -08:00
Christian 331e6bcf62 Merge branch 'master' into snapshot15
Fix up compilation and patching errors

Conflicts:
	common/cpw/mods/fml/common/registry/GameRegistry.java
	conf/joined.srg
	conf/params.csv
	conf/version.cfg
	patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
2013-01-22 15:21:22 -05:00
Christian 1b332fc1ea Fix up packages.csv ordering for easier diffing 2013-01-22 14:43:27 -05:00
Christian 51fcf93605 Update for MCP7.30c - fixes redstone rendering issues 2013-01-22 14:40:09 -05:00
Christian 472ca8c8a9 Add in a registry method to allow for alternative TileEntity names- they will be used to support
loading maps containing the older definitions.
2013-01-22 13:11:32 -05:00
Christian c13502c690 Remember to add the new patches! 2013-01-22 09:32:53 -05:00
Christian 6962786e4b The "ServerStarting" event should now properly crash the server if it fails,
so the client will properly exit. Also, added in a "pre-server-start" event
that fires before the worlds are loaded for a save, just for you immibis.
2013-01-22 09:17:04 -05:00
Christian 509b5f8e7e Javadoc cleanup 2013-01-21 21:37:29 -05:00
Christian 825ecf1a7f Fix breaking change 2013-01-20 17:54:56 -05:00
Christian 7f4818fd94 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates 2013-01-20 11:31:47 -05:00
Christian b52c44e42b Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates 2013-01-20 11:31:24 -05:00
Christian 2c58102515 Update MCP to MCP7.26a and refresh MCP names 2013-01-20 10:30:36 -05:00
Christian 3ddf9b2382 Update address of the FML repository to the new location in all the files 2013-01-18 21:26:43 -05:00
bspkrs cb769265f0 Fix logical error in comment text 2013-01-16 23:49:09 -05:00
Christian d576691bfa Update license text to make clear that FML is not a way to sidestep
MCP licensing.
2013-01-15 16:54:26 -05:00
Christian 180173fa94 Fix mcp conf md5 signatures for the snapshot 2013-01-12 14:25:03 -05:00
donington 3e4ed24750 FMLLogFormatter: dynamic log level name
FMLLogFormatter now uses getLocalizedName or getName for log level name

Changes to be committed:
	modified:   common/cpw/mods/fml/relauncher/FMLLogFormatter.java
2013-01-12 00:42:36 -05:00
Christian 334e386b56 Temporary hosting 2013-01-12 00:38:42 -05:00
Christian c048ec7aef Another packaging update. I think we're done now. 2013-01-12 00:33:32 -05:00
Christian 3e5a3fb0e4 Fix modlist to use the new texture binding functions, i think 2013-01-12 00:27:11 -05:00
Christian 59af780c91 A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone 2013-01-12 00:17:35 -05:00
Christian cad228093d Delete old patches not needed anymore 2013-01-11 23:53:14 -05:00
Christian 431372dc5f Initial patch update for snapshot 2013-01-11 23:47:05 -05:00
Christian 31faf09c49 Initial setup for snapshot- the client compiles, but patches fail to apply. 2013-01-11 22:49:09 -05:00
LexManos 674a9e5e52 Updated patches for new JAD style names. 2013-01-11 13:16:40 -08:00
LexManos 04e4ce6266 FML will now rename local variables to have JAD-style names instead of FernFlower var## names. New script to do this, to allow for modders to run it over there own code: python rename_vars.py -mcp [folders to rename]... 2013-01-11 13:16:23 -08:00
Christian 8edde44161 Fix incorrect end length calculation. Closes #161 Thanks BStramke! 2013-01-11 09:41:47 -05:00
Christian 79c7933b5e Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in
all languages now (assumes UTF-8)
2013-01-08 08:46:50 -05:00
cpw 256aef5e0f Merge pull request #158 from CovertJaguar/patch-2
Added an accessor for villagers
2013-01-08 05:36:45 -08:00