Christian
20337b6e8a
Update to MC 1.4.6
2012-12-17 21:48:29 -05:00
Christian
33ff87d8d9
Fix build script
2012-12-17 17:56:00 -05:00
Christian
af06bbd373
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
Christian
92a47ace8b
More work
2012-12-17 14:30:51 -05:00
Christian
f285ac369a
Merge branch 'securityupdate'
2012-12-17 11:46:47 -05:00
Christian
68e76c273a
Merge branch 'master' into securityupdate
2012-12-17 11:46:27 -05:00
Christian
e98c311a2c
Fix up handling null names. *sigh*
2012-12-17 10:29:54 -05:00
Christian
293edb316e
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
Christian
2d4465eaf7
More fixes
2012-12-16 21:22:55 -05:00
LexManos
9266ff394a
Updated MCP download mirriors upon Searge's request.
2012-12-16 05:35:46 -08:00
Christian
bbfd85ed1e
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
Christian
6ecc2303f4
Fix newline fun
2012-12-15 22:37:32 -05:00
Christian
d35cfda798
More stuff for the thingy
2012-12-15 22:30:16 -05:00
Christian
cffa2a92a6
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
LexManos
31695d5ec1
Fix var name messup
2012-12-13 00:22:30 -08:00
LexManos
bfb3020505
Update released eclipse project to link BouncyCastle
2012-12-12 23:44:28 -08:00
Christian
22a88ea2e4
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
Christian
0423fa5885
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
LexManos
d17fbb527f
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
LexManos
d40bb0fe32
Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx
2012-12-11 21:47:45 -08:00
Christian
a513060a81
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
8e594a347c
Remove extraneous patch file
2012-12-11 20:37:12 -05:00
Christian
9af365edcc
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
Christian
70554d6a2b
Merge branch 'repackage' of github.com:cpw/FML into repackage
...
Conflicts:
common/cpw/mods/fml/common/registry/GameData.java
2012-12-11 14:49:23 -05:00
cpw
eb84f52493
Merge pull request #145 from pahimar/master
...
More logging of loading files in LanguageRegistry
2012-12-11 08:28:39 -08:00
pahimar
d074830d95
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
LexManos
f7fe9ebeb2
Fix patches, rebased with HEAD
2012-12-10 15:37:48 -08:00
LexManos
b2c8f37aec
Remade python dist as 32-bit.
2012-12-10 15:26:15 -08:00
Christian
a5bcccab59
Fixing id map generation - should validate correctly now
2012-12-10 15:26:13 -08:00
LexManos
a11f368b62
Reenabled replacement of the eclipse folder.
2012-12-10 14:56:23 -08:00
LexManos
59656b004b
Remade python dist as 32-bit.
2012-12-10 14:56:05 -08:00
Christian
ff8cb67a99
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
Christian
fa5256c8a7
Fix up idmap code
2012-12-09 22:01:13 -05:00
LexManos
4b19987ee6
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
LexManos
9f43303073
Removed remaining references to src/common
...
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
2012-12-09 02:10:28 -08:00
LexManos
a20958fb56
Updated build script to not use the mcp common directory as it doesn't exist anymore.
2012-12-08 21:41:51 -08:00
LexManos
8c71098081
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
a3a5b44acb
Updated the update_packages script to support different mcp locations
2012-12-08 21:40:39 -08:00
LexManos
0473273709
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
LexManos
bf492f32f9
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -08:00
LexManos
4744677646
Some stragler patches
2012-12-08 19:34:35 -08:00
LexManos
f0af2e4ef5
Updated patches to new packages.
2012-12-08 19:33:29 -08:00
LexManos
c7f763d6f0
Give new classes a distinct package to be moved from.
2012-12-08 17:50:14 -08:00
LexManos
563b8d1215
Fixed 0.tree to actually refresh the workspace.
2012-12-08 17:35:11 -08:00
LexManos
221493453f
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
Christian
86c928430a
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
cd0a0e51d5
Add a modid on the mods list, should make it easier to do things like forge chunkloading config
2012-12-08 16:46:47 -08:00
Christian
66ff95f9d7
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
Christian
8ad172295f
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
26a2ef5995
Add a modid on the mods list, should make it easier to do things like forge chunkloading config
2012-12-04 18:08:27 -05:00
Christian