LexManos
ca2d1fb033
Dixed ev eclipse worksapce, now references BC.
2012-12-18 05:10:32 -08:00
LexManos
ec8d75d1b2
Added client src folder to classpath for startclient/startserver.
2012-12-18 05:06:20 -08:00
LexManos
e9cabc2b7e
Removed hardcoded additions
2012-12-18 05:05:25 -08:00
Christian
5770708e75
Update to MC 1.4.6
2012-12-17 21:48:29 -05:00
Christian
251cb92b12
Fix build script
2012-12-17 17:56:00 -05:00
Christian
0b36189547
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
Christian
47dfd99d4f
More work
2012-12-17 14:30:51 -05:00
Christian
289ce3339a
Merge branch 'securityupdate'
2012-12-17 11:46:47 -05:00
Christian
65473ad838
Merge branch 'master' into securityupdate
2012-12-17 11:46:27 -05:00
Christian
25c367f9db
Fix up handling null names. *sigh*
2012-12-17 10:29:54 -05:00
Christian
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
Christian
bbe4b9fbc2
More fixes
2012-12-16 21:22:55 -05:00
LexManos
3369976c05
Updated MCP download mirriors upon Searge's request.
2012-12-16 05:35:46 -08:00
Christian
a26b495ef9
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
Christian
8f3b1aeff7
Fix newline fun
2012-12-15 22:37:32 -05:00
Christian
d811fea82c
More stuff for the thingy
2012-12-15 22:30:16 -05:00
Christian
16651d6994
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
LexManos
70b9cd6e1f
Fix var name messup
2012-12-13 00:22:30 -08:00
LexManos
60b6913a87
Update released eclipse project to link BouncyCastle
2012-12-12 23:44:28 -08:00
Christian
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
Christian
d13187d689
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
LexManos
238dcdd18d
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
LexManos
1812016e29
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
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
Christian
f97b330605
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
29348240fc
Merge pull request #145 from pahimar/master
...
More logging of loading files in LanguageRegistry
2012-12-11 08:28:39 -08:00
pahimar
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
LexManos
65a8bbf9e7
Fix patches, rebased with HEAD
2012-12-10 15:37:48 -08:00
LexManos
9be4b14371
Remade python dist as 32-bit.
2012-12-10 15:26:15 -08:00
Christian
1c5b8ecb7b
Fixing id map generation - should validate correctly now
2012-12-10 15:26:13 -08:00
LexManos
5753eb0738
Reenabled replacement of the eclipse folder.
2012-12-10 14:56:23 -08:00
LexManos
41e899dcea
Remade python dist as 32-bit.
2012-12-10 14:56:05 -08:00
Christian
aee1a3f24d
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
Christian
3f383e2dc6
Fix up idmap code
2012-12-09 22:01:13 -05:00
LexManos
5e0af1f2cb
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
LexManos
00bdb3dc0b
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
3537fb7f21
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
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
21c66eaf98
Updated the update_packages script to support different mcp locations
2012-12-08 21:40:39 -08:00
LexManos
1742abb139
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
LexManos
804e597aca
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -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
LexManos
ded6b4667b
Give new classes a distinct package to be moved from.
2012-12-08 17:50:14 -08:00
LexManos
2009c89bf7
Fixed 0.tree to actually refresh the workspace.
2012-12-08 17:35:11 -08:00
LexManos
3e1efdf05b
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -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
e6d66322fe
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