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

This means the FML-Server project is now defunct as all code is either common, client or bukkit.

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

..

bukkit

And there are not 1000 seconds in a second

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

client

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

common

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

conf

Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain.

2012-08-10 18:25:11 -07:00

eclipse

More ticking hooks, and some other bits of clean up. Very close to "done" now.

2012-08-10 17:11:01 -04:00

install

Fix MCPMerger injecting Side/SideOnly when it already exists.

2012-08-12 04:27:36 -07:00

patches

Change language loading a bit

2012-08-13 20:28:53 -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

Line endings for this branch

2012-08-01 21:18:55 -02:30

.gitignore

Introduced patching of runtime/commands.py to allow for usage of the src/common folder.

2012-08-02 00:51:51 -07: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

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

cleanup_source.py

Fixed regex issue in last push.

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

commands.patch

updated conf, commands patch (missing newline?) and capturing the actual running

2012-08-13 00:17:34 -04: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

Harvest MC version from MCP

2012-07-02 13:31:45 -04:00

LICENSE-fml.txt

Add in the ability to create versioned dependencies for mod relationships

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

mcp_merge.cfg

Stage 1 of merging the client and server for MCP.

2012-08-08 05:48:06 -07: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