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
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
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
509b5f8e7e
Javadoc cleanup
2013-01-21 21:37:29 -05:00
825ecf1a7f
Fix breaking change
2013-01-20 17:54:56 -05:00
7f4818fd94
Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
2013-01-20 11:31:47 -05:00
b52c44e42b
Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
2013-01-20 11:31:24 -05:00
2c58102515
Update MCP to MCP7.26a and refresh MCP names
2013-01-20 10:30:36 -05:00
3ddf9b2382
Update address of the FML repository to the new location in all the files
2013-01-18 21:26:43 -05:00
cb769265f0
Fix logical error in comment text
2013-01-16 23:49:09 -05:00
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
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
431372dc5f
Initial patch update for snapshot
2013-01-11 23:47:05 -05:00
31faf09c49
Initial setup for snapshot- the client compiles, but patches fail to apply.
2013-01-11 22:49:09 -05:00
8edde44161
Fix incorrect end length calculation. Closes #161 Thanks BStramke!
2013-01-11 09:41:47 -05:00
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
224d933564
Added an accessor for villagers
2013-01-07 14:55:17 -08:00
80193d4969
Add in a "server stopped" event
2012-12-30 23:52:38 -05:00
2454ed0fbf
Add in some classloader debugging information: use fml.debugClassLoading=true as a system property
...
to track down problems with classes not being found or loading erratically.
2012-12-30 21:32:37 -05:00
964c51f4ae
Update for MC 1.4.7
2012-12-28 10:07:53 -05:00
bf9272f61e
Fix multiple GUI containers for ML containers. Sorry ultimatechest that
...
this fix took so long, a bug report at github.com/cpw/FML would help,
next time ;)
2012-12-27 23:00:52 -05:00
193aae6030
Log if there's a problem reading the class bytes
2012-12-27 23:00:37 -05:00
95f0315634
Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent
2012-12-25 15:59:30 -08:00
35ee8510fe
Fix a message delivery issue in IMC
2012-12-24 09:41:22 -05:00
052d798970
Some tweaks for signing and ID matching
2012-12-23 22:27:26 -05:00
909b629fa4
MCP will reobf classes with reserved names in windows to a legal file name. And FML will try to read these classes over the default ones.
2012-12-19 19:10:00 -08:00
6201e51134
Update MCP to newer version
...
Fix fingerprint fire
2012-12-18 16:43:48 -05:00
2fc0ba693c
InterModComms now supports a runtime polling based model for inter-mod comms at
...
runtime.
Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
2012-12-18 13:58:57 -05:00
926766b487
Don't be as alarming about item overwrites.
2012-12-18 08:33:46 -05:00
7caae273c5
Added configuration file which allows modids to ignore ID validation checking. IT WILL CRASH YOUR GAME in 99.999% of cases.
...
Immibis is a whingy ass. And TinyTimRob too. Now STFU and GTFO. closes #510 for ever.
2012-12-18 08:15:46 -05:00
5770708e75
Update to MC 1.4.6
2012-12-17 21:48:29 -05:00
0b36189547
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
47dfd99d4f
More work
2012-12-17 14:30:51 -05:00
65473ad838
Merge branch 'master' into securityupdate
2012-12-17 11:46:27 -05:00
25c367f9db
Fix up handling null names. *sigh*
2012-12-17 10:29:54 -05:00
e6c71bb148
Some tweaks to item identification. The GameRegistry methods are deprecated
...
to encourage you to use the new named ones instead. These will force a
name on the item/block, allowing for stronger matching than "sequential guessing"
2012-12-16 22:57:11 -05:00
bbe4b9fbc2
More fixes
2012-12-16 21:22:55 -05:00
a26b495ef9
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
d811fea82c
More stuff for the thingy
2012-12-15 22:30:16 -05:00
16651d6994
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
1dcf3bfbdc
Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update.
...
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 19:31:05 -05:00
d13187d689
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
55dc3467de
Change to download bouncy castle as well. We also finally properly use the downloaded libs
...
even in vanilla code!
2012-12-11 22:37:07 -05:00
64226c3d7e
Merge branch 'repackage'
...
Conflicts:
build.xml
client/cpw/mods/fml/client/FMLClientHandler.java
client/cpw/mods/fml/client/GuiIdMismatchScreen.java
common/cpw/mods/fml/common/FMLCommonHandler.java
common/cpw/mods/fml/common/IFMLSidedHandler.java
common/cpw/mods/fml/common/network/ModIdMapPacket.java
common/cpw/mods/fml/common/network/ModListResponsePacket.java
common/cpw/mods/fml/common/registry/GameData.java
common/cpw/mods/fml/common/registry/GameRegistry.java
common/cpw/mods/fml/common/registry/ItemData.java
common/cpw/mods/fml/common/registry/LanguageRegistry.java
common/cpw/mods/fml/server/FMLServerHandler.java
install/fml.py
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
2012-12-11 14:58:38 -05:00
5ef0cbfc32
Update common/cpw/mods/fml/common/registry/LanguageRegistry.java
...
Add in logging of what file failed to be loaded
2012-12-11 11:27:05 -05:00
aee1a3f24d
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
3f383e2dc6
Fix up idmap code
2012-12-09 22:01:13 -05:00
099b8259a6
Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect.
2012-12-08 21:41:16 -08:00
1742abb139
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
804e597aca
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -08:00
Christian