LexManos
b73c85c82c
Fix for FML Fixes eclipse workspace, now sets execution bits on astyle-osx, and mcp .sh files. Also now kills install if astyle is not found.
2012-12-11 21:40:03 -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
03f1418924
Updated FML to 486:
...
02b54ca8: Add a modid on the mods list, should make it easier to do things like forge chunkloading config
70670f2f: Fix build eclipse extractor task
b9fa3fc9: Add in storage, detection and validation of the ItemID array between client and server
5e5d8206: Fixing id map generation - should validate correctly now
f9fc06a8: Remade python dist as 32-bit.
93d47a1c: Reenabled replacement of the eclipse folder.
2012-12-10 15:53:30 -08:00
LexManos
9ab56779f9
Fixed install --mcp-dir
2012-12-10 15:43:40 -08:00
LexManos
f105e52a21
Fixed release -skipchangelog
2012-12-10 15:43:19 -08: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
2761b5deab
And finally, fix up the release install script to have a parameter to specity the MCP directory.
2012-12-09 18:58:01 -08:00
LexManos
5792c7fb76
Fix Forge install script to use python shipped with FML.
2012-12-09 18:44:43 -08:00
LexManos
56e4849c02
Push didn't get all of eclipse....
2012-12-09 14:11:59 -08:00
LexManos
719db6eabc
Cleaned up eclipse workspace and moved it to a zip file.
...
Setup will extract it if it doesn't already exist.
2012-12-09 14:09:11 -08: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
Christian
57fe3c475a
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
Christian
3909cdb3ec
Fix RenderBlocks patch, touch branch
2012-12-07 16:43:15 -05:00
Scott Killen
768484d393
For @XCompWiz, added a hook to allow mods to dynamically change the color that water is rendered.
2012-12-07 16:43:15 -05:00
Scott Killen
079db5d854
Readded unchanged version
2012-12-07 16:43:15 -05:00
Scott Killen
f747a97b85
Removed unchanged file
2012-12-07 16:43:15 -05:00
Scott Killen
69ac1fa3a5
Added terrain gen events
...
Added biome color events for @XCompWiz
2012-12-07 16:43:15 -05:00
Christian
fa6769dbcf
Fix release script for new forge job name. Add in skip changelog option for local builds
2012-12-07 16:42:32 -05:00
LexManos
ece6628b50
Remove MCP from released src distro.. whops.
2012-12-07 11:25:19 -08:00
Christian
bccad16ea6
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-07 01:52:16 -05:00
Christian
6bc367f005
Fix static method, closes #271
...
Don't spam the log if a mod requests a ticket beyond their maximum. A single message is fine.
2012-12-06 16:14:15 -05:00
Chicken Bones
f1e3481c0a
Add Chunk Watch and UnWatch events.
2012-12-06 09:11:20 -05:00
Abrar Syed
5cb03bc07d
fix List configs
2012-12-06 09:09:34 -05:00
GuntherDW
021ec72f11
Fix typo in chunkmanager config
2012-12-06 09:31:06 +01:00
Christian
538755dad7
Tweak release.py script: HEAD==master in general
...
Update FML: 26a2ef5
26a2ef5 Add a modid on the mods list, should make it easier to do things like fo
b4e3490 Fix build eclipse extractor task
828341f Fix typo
7a8dae5 Try and make branch non-derpy
d3c0e1f Try defaulting branch differently
9c77d3f Remove old eclipse workspace and ship/extract as a zip file (use ant set
6371e9b Assume Forge is the parent directory when checking for AT configs.
516954e Name both zips the same format
1151d5c Last part of branch name only please
25f1dda Try and get a valid branch name on jenkins
39a146f Clean up build.xml script- support outputting a branched jar file
037dcae Small derp in install.py
01d6da3 Try marking python as binary.
8b26659 FML will now attempt to download MCP as part of the install process Now
42b3e6a Windows Python distrabution created using py2exe, thanks Fesh0r for the
e709ab8 Marked more spots in gui/items bitmask as being free.
2012-12-05 22:09:01 -05:00
Christian
d4b06fd4bc
Add a modid on the mods list, should make it easier to do things like forge chunkloading config
2012-12-04 18:08:27 -05:00