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
|
51fcf93605
|
Update for MCP7.30c - fixes redstone rendering issues
|
2013-01-22 14:40:09 -05:00 |
|
Christian
|
c13502c690
|
Remember to add the new patches!
|
2013-01-22 09:32:53 -05:00 |
|
Christian
|
c048ec7aef
|
Another packaging update. I think we're done now.
|
2013-01-12 00:33:32 -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 |
|
LexManos
|
674a9e5e52
|
Updated patches for new JAD style names.
|
2013-01-11 13:16:40 -08:00 |
|
Christian
|
55ca46b382
|
Move server stopped *after* the server has actually stopped. *sigh*
|
2012-12-31 01:20:35 -05:00 |
|
Christian
|
80193d4969
|
Add in a "server stopped" event
|
2012-12-30 23:52:38 -05:00 |
|
LexManos
|
484a673b1f
|
Remove unneeded file
|
2012-12-20 14:30:59 -08:00 |
|
LexManos
|
c5a1b58d85
|
Fixed placement of onConnectionClosed callback.
|
2012-12-20 14:30:41 -08:00 |
|
Christian
|
5770708e75
|
Update to MC 1.4.6
|
2012-12-17 21:48:29 -05:00 |
|
Christian
|
a26b495ef9
|
Move Side and SideOnly to relauncher package
|
2012-12-15 23:21:26 -05:00 |
|
Christian
|
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 |
|
Christian
|
229a501def
|
Remove extraneous patch file
|
2012-12-11 20:37:12 -05:00 |
|
Christian
|
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 |
|
LexManos
|
65a8bbf9e7
|
Fix patches, rebased with HEAD
|
2012-12-10 15:37:48 -08:00 |
|
Christian
|
1c5b8ecb7b
|
Fixing id map generation - should validate correctly now
|
2012-12-10 15:26:13 -08:00 |
|
Christian
|
aee1a3f24d
|
Fixing id map generation - should validate correctly now
|
2012-12-09 22:24:16 -05:00 |
|
LexManos
|
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 |
|
LexManos
|
e63311b4d0
|
Some stragler patches
|
2012-12-08 19:34:35 -08:00 |
|
LexManos
|
b02f93aeed
|
Updated patches to new packages.
|
2012-12-08 19:33:29 -08:00 |
|
Christian
|
f4070ff625
|
Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
|
2012-12-08 17:05:18 -08:00 |
|
Christian
|
bccad16ea6
|
Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
|
2012-12-07 01:52:16 -05:00 |
|
Christian
|
9cdbadb66c
|
Merge branch 'master' into repackage
Conflicts:
patches/minecraft/net/minecraft/client/EntityFX.java.patch
|
2012-12-03 17:31:29 -05:00 |
|
Christian
|
f74b8ac30b
|
Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
This reverts commit fa567014a54b3273002fe9cf424ab4cf3ec54c3a.
|
2012-11-20 08:27:13 -05:00 |
|
LexManos
|
8b1ed2d255
|
First half of new patches
|
2012-11-20 03:15:01 -08:00 |
|
LexManos
|
397d36e900
|
Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config.
|
2012-11-19 17:45:53 -08:00 |
|
Christian
|
02b6904843
|
Attempt to fix a possible comodification risk
|
2012-11-18 20:40:48 -05:00 |
|
Christian
|
8025bf3a2c
|
Change texturebinding to use the textureId directly rather than iconIndex
to determine if it needs to rebind the texture sheet
|
2012-11-18 08:45:25 -05:00 |
|
Christian
|
c445ab004b
|
Fix World patch- workaround no longer required and leftovers are bad.
|
2012-11-17 23:44:53 -05:00 |
|
Christian
|
783926194e
|
Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
|
2012-11-16 22:50:21 -05:00 |
|
Christian
|
e8c5b0791f
|
Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious.
Fix NPE for FML crash report on server. Clean up dead patches.
|
2012-11-16 22:50:00 -05:00 |
|
Christian
|
1c9b59b405
|
Clean up a patch
|
2012-11-16 16:49:44 -05:00 |
|
LexManos
|
6191f2530c
|
Fix for ModLoader static overrides not displaying.
|
2012-11-15 14:08:41 -08:00 |
|
Christian
|
3dbe774ec1
|
Update to MC 1.4.4
|
2012-11-08 17:55:20 -05:00 |
|
Christian
|
9c3b07f53a
|
Clean up some patch fuzz
|
2012-11-02 17:32:39 -04:00 |
|
Christian
|
8ec0cf6ab9
|
Update to 1.4.3
|
2012-11-01 23:53:13 -04:00 |
|
Christian
|
92010b5bca
|
Patch a file handle leak in RegionFileCache handling when under memory pressure.
|
2012-10-31 22:58:01 -04:00 |
|
Christian
|
1bd53fe75f
|
Fix some whitespace issues, handle possibly bugged entities as well
|
2012-10-30 09:13:18 -04:00 |
|
Christian
|
01048c704b
|
Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
|
2012-10-29 17:41:08 -04:00 |
|
Christian
|
6e8902da86
|
Update FML for Minecraft 1.4.1
|
2012-10-23 18:00:33 -04:00 |
|
Christian
|
190c71eeb5
|
Ship a client only class so the merge works both sides.
|
2012-10-21 22:50:20 -04:00 |
|
Christian
|
698f0e69eb
|
Remove fuzz from patches for INetworkManager change
|
2012-10-20 17:16:50 -04:00 |
|
Christian
|
279b5d5e23
|
Clean up a bit of patch fuzz
|
2012-10-20 12:39:40 -04:00 |
|
LexManos
|
ce847a7c53
|
Inital patch update to 1.4
|
2012-10-20 02:43:03 -07:00 |
|
LexManos
|
7afbc1ab93
|
Moved into EntityVillager
|
2012-10-20 02:42:34 -07:00 |
|
LexManos
|
f59de49682
|
We don't need logging here...
|
2012-10-20 02:27:26 -07:00 |
|
Christian
|
3599c11599
|
Fix logging problems- log death messages and re-route the server through FML logs properly.
|
2012-10-17 18:05:23 -04:00 |
|
Christian
|
124f47f55c
|
Update patches *sigh*
|
2012-10-02 22:04:25 -04:00 |
|