Christian 9cdbadb66c Merge branch 'master' into repackage ...

Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch

2012-12-03 17:31:29 -05:00

..

bukkit

And there are not 1000 seconds in a second

2012-06-28 08:31:32 -04:00

client

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

common

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

conf

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

eclipse

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

install

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

patches

Merge branch 'master' into repackage

2012-12-03 17:31:29 -05:00

python

Try marking python as binary.

2012-12-02 20:19:55 -08:00

refactorscripts

Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use...

2012-10-20 17:07:59 -04:00

server/net/minecraft/src

Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use

2012-08-13 22:51:53 -04:00

test/cpw/mods/fml/test

ModSorting test case

2012-06-21 21:56:16 -04:00

.gitattributes

Try marking python as binary.

2012-12-02 20:19:55 -08:00

.gitignore

FML will now attempt to download MCP as part of the install process

2012-12-02 19:59:22 -08:00

applypatches.py

Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other.

2012-08-01 06:54:57 -07:00

build.xml

Name both zips the same format

2012-12-03 08:38:20 -05:00

cleanup_source.py

Fixed regex issue in last push.

2012-05-27 01:40:22 -07:00

commands.patch

Inital script side commit for MC source repackaging done.

2012-11-20 01:55:41 -08:00

decompile.py

Fix decompile

2012-08-10 20:41:59 -07:00

fmlbuild.properties-sample

Add in more ignore stuff and a sample "fmlbuild.properties" file

2012-03-30 16:42:11 -04:00

generatechangedfilelist.py

Newlines in diff file

2012-08-11 02:27:19 -07:00

getversion.py

Last part of branch name only please

2012-12-03 08:30:44 -05:00

ignore-git.sh

Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace

2012-10-20 15:24:05 -04:00

LICENSE-fml.txt

Add in the ability to create versioned dependencies for mod relationships

2012-07-30 17:01:27 -04:00

mc_versions.cfg

FML will now attempt to download MCP as part of the install process

2012-12-02 19:59:22 -08:00

mcp_merge.cfg

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

update_packages.py

Inital script side commit for MC source repackaging done.

2012-11-20 01:55:41 -08:00

update_patches.bat

Stage 1 of merging the client and server for MCP.

2012-08-08 05:48:06 -07:00

update_patches.py

Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts.

2012-08-04 03:34:34 -07:00

update_patches.sh

Add the hooks for crafting and smelting

2012-04-06 10:34:44 -04:00

updateasmdata.py

Updated to 1.4.5b

2012-11-19 15:35:08 -08:00

updatefml.txt

Merge joined.exc add update howto

2012-11-20 08:38:33 -05:00