diff --git a/conf/joined.exc b/conf/joined.exc index bfd5d84c14..7526b29f44 100644 --- a/conf/joined.exc +++ b/conf/joined.exc @@ -2126,7 +2126,6 @@ net/minecraft/src/EffectRenderer.func_78871_a(IIIII)V=|p_78871_1_,p_78871_2_,p_7 net/minecraft/src/EffectRenderer.func_78872_b(Lnet/minecraft/src/Entity;F)V=|p_78872_1_,p_78872_2_ net/minecraft/src/EffectRenderer.func_78873_a(Lnet/minecraft/src/EntityFX;)V=|p_78873_1_ net/minecraft/src/EffectRenderer.func_78874_a(Lnet/minecraft/src/Entity;F)V=|p_78874_1_,p_78874_2_ -net/minecraft/src/EffectRenderer.func_90037_b(Lnet/minecraft/src/EntityFX;)V=|p_90037_1_ net/minecraft/src/EmptyChunk.(Lnet/minecraft/src/World;II)V=|p_i3770_1_,p_i3770_2_,p_i3770_3_ net/minecraft/src/EmptyChunk.func_76588_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;)V=|p_76588_1_,p_76588_2_,p_76588_3_ net/minecraft/src/EmptyChunk.func_76589_b(IIII)Z=|p_76589_1_,p_76589_2_,p_76589_3_,p_76589_4_ diff --git a/updatefml.txt b/updatefml.txt new file mode 100644 index 0000000000..6f04bd5670 --- /dev/null +++ b/updatefml.txt @@ -0,0 +1,17 @@ +Updating FML: +1. Grab MCP +2. Complete the mc_versions.cfg - add a new entry and update md5s from MCP +3. Copy joined.exc from MCP conf into FML conf. +4. Merge other mcp configuration changes into FML conf. (generally only mcp.cfg should need changing to update md5s) +If obfuscation changed: +5. Run the updateasmdata.py script to refresh the ASM metadata in fml_at.cfg (only +6. Inspect and update mcp_merge.cfg +7. Inspect and update fml_marker.cfg +Always: +8. Merge MCP mcmod.info into mcpmod.info and update the mcp.png graphic if necessary +9. Run ant setupenvironment to try and build the FML environment +10. Fix up any patch rejections +11. Commit the result to git +12. Tag git with a new version: git tag -a vx.y +13. Update jenkins with new MCP and jars +14. Push tags to git followed by the commit itself