Christian 578ef5cfeb Merge branch 'master' into repackage ...

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

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

..

.metadata/.plugins

Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."

2012-11-20 08:27:13 -05:00

Clean

Remove common folder from projects

2012-11-20 03:15:45 -08:00

FML

Remove common folder from projects

2012-11-20 03:15:45 -08:00

.gitignore

Update gitignore - ignore the files that will change or be deleted

2012-10-20 15:14:06 -04:00