LexManos
45a3f771bd
Updated python scripts for removal of common folder
2012-12-12 23:38:51 -08:00
LexManos
1daa45c7f4
Update FML:
...
Minecraft is now decompiled into sane package names.
Got rid of the src/common folder as the only folder that exists is src/mincraft, because the client and server codebase is merged.
ID Map generation/validation fixes
2012-12-12 23:31:17 -08:00
LexManos
e7008ae750
Manual import fixes
2012-12-12 23:27:57 -08:00
LexManos
c1f0302f9d
Fixup workspace for BC replacement
2012-12-12 23:01:05 -08:00
LexManos
061ab81041
Automatically resolved imports.
2012-12-12 21:58:35 -08:00
LexManos
52e87dd165
Bump version to 6.4.2 to mark the merge of TerrainGen branch.
2012-12-12 18:34:16 -08:00
Christian
3ed793bce5
Merge branch 'terraingen'
2012-12-12 21:13:20 -05:00
LexManos
ff30c11bb5
Derp, imported the repackaged names not old names.
2012-12-12 17:18:36 -08:00
LexManos
05be21b3f1
Update FML:
...
2f34290e: Fix possible escape leakage..
83deece6: Change ID management slightly. IDs are tracked by block type for ItemBlock items now. This means servers will need to update.
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 17:06:02 -08:00
Christian
1dcf3bfbdc
Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update.
...
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 19:31:05 -05:00
Christian
d13187d689
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
LexManos
238dcdd18d
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
LexManos
d7f1923d7d
Update readme to reflect the fact that we now download MCP.
2012-12-12 14:28:36 -08:00
LexManos
910f9e852f
Make BlockButton.sensible protected and non-final
2012-12-12 02:48:30 -08:00
LexManos
0433190b01
Expose BiomeDecorator fields for custom Biome information, Issue: #239
2012-12-12 02:42:13 -08:00
LexManos
d4a5b7e3a5
Fix shouldRiderSit() to properly determine if rider is sitting.
2012-12-12 02:24:47 -08:00
LexManos
76d6bc3cfa
Fixes crash when mods add TreeMaps to the Configuration map, thanks AtomicStryker, PR: #282
2012-12-12 02:20:46 -08:00
LexManos
c68dfae100
Fix type in ForgeChunkManager.ticketCountAvaILableFor, thanks iChun PR: #285
2012-12-12 02:16:23 -08:00
LexManos
0e82a3952d
Creative GUI will now remember what tab page you were on, thanks Matchlighter PR #290
2012-12-12 02:11:27 -08:00
LexManos
dfd9844c13
Pistons now respect world height a little better, for PR #286 , will review Rotation event later.
2012-12-12 01:58:24 -08:00
LexManos
599591e883
New TileEntity function to determine if the TE should be destroied when Block/Meta changes, For Issue #300
2012-12-12 01:55:12 -08:00
LexManos
ee0763fb4a
Add CloudRenderer for PR #304
2012-12-12 01:35:18 -08:00
LexManos
9381fd07be
Add .DS_Store to the gitignore for mac users
2012-12-12 01:24:19 -08:00
LexManos
c48a15357b
Moved check if map cursor should 'spin' and which world a player respawns in to WorldProvider for PR #308
2012-12-12 01:22:43 -08:00
LexManos
17637de863
Made BlockButton.func_82535_o overrideable for issue #311
2012-12-12 01:05:18 -08:00
LexManos
33901fb968
Made GuiContainer.drawSlotInventory overrideable for issue #312
2012-12-12 01:03:00 -08:00
LexManos
9c8fb046be
Fix ForgeDirection.ROTATION_MATRIX for issue #313
2012-12-12 01:02:24 -08:00
LexManos
1812016e29
Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx
2012-12-11 21:47:45 -08:00
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