Christian
ae7e328228
Fix a potential problem with "Entity already added" when using the dormant
...
chunk cache capability. The entities in the dormant chunk cache will get new
IDs prior to the cached chunk returning.
2013-01-25 21:21:20 -05:00
Christian
c19646421a
Deprecate the old GUI ticktype. They're dead and have been for some time.
2013-01-24 17:29:46 -05:00
Christian
3dbffd1754
Tweak a method signature
2013-01-24 10:23:36 -05:00
LexManos
d9db242f4c
Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling server.
2013-01-24 03:08:19 -08:00
Christian
f20ea649c6
Attempt to fix a possible NPE in the face of ChickenBones' hackery. ChickenBones. stop it!
2013-01-23 23:36:59 -05:00
Christian
78e192e28e
Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches
...
Conflicts:
fml-src-1.4.7-4.7.22.539-master.zip
fml-src-1.4.7-4.7.4.520-master.zip
fml-src-13w02b-4.99.16.541-snapshot15.zip
patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch
patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch
patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch
patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch
patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch
patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
patches/minecraft/net/minecraft/world/World.java.patch
patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch
patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch
patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch
2013-01-22 17:28:28 -05:00
Christian
94eb5cc29b
Fix a couple of forge patches
...
Update FML: d075daf
d075daf Merge branch 'master' into snapshot15 Fix up compilation and patching errors
1bd6847 Fix up packages.csv ordering for easier diffing
dd832f2 Update for MCP7.30c - fixes redstone rendering issues
aebf6eb Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definiti
8921cfe Remember to add the new patches!
cd67596 The "ServerStarting" event should now properly crash the server if it fails, so the client will properly exit. Also, added in a "pre-server
e1c6630 Javadoc cleanup
5ce4e31 Fix breaking change
a99c488 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
94282c5 Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
7ad8529 Update MCP to MCP7.26a and refresh MCP names
15534ed Update address of the FML repository to the new location in all the files
aa822e3 Fix logical error in comment text
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
0165742 Fix mcp conf md5 signatures for the snapshot
26a5b31 FMLLogFormatter: dynamic log level name
2013-01-22 17:03:33 -05:00
Christian
331e6bcf62
Merge branch 'master' into snapshot15
...
Fix up compilation and patching errors
Conflicts:
common/cpw/mods/fml/common/registry/GameRegistry.java
conf/joined.srg
conf/params.csv
conf/version.cfg
patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
2013-01-22 15:21:22 -05:00
Christian
1b332fc1ea
Fix up packages.csv ordering for easier diffing
2013-01-22 14:43:27 -05:00
Christian
51fcf93605
Update for MCP7.30c - fixes redstone rendering issues
2013-01-22 14:40:09 -05:00
Christian
c77cb8ba53
Update FML:aebf6eb
...
aebf6eb Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definiti
2013-01-22 13:53:46 -05:00
Christian
472ca8c8a9
Add in a registry method to allow for alternative TileEntity names- they will be used to support
...
loading maps containing the older definitions.
2013-01-22 13:11:32 -05:00
Chicken Bones
323517e88b
Gave entities and tile entities access to the second render pass for translucency.
2013-01-23 03:07:00 +10:00
Christian
a5325cf0a8
Change DimensionManager.getCurrentSaveRootDirectory() to try and work even for the new server about to start event
...
Update FML:8921cfe
8921cfe Remember to add the new patches!
cd67596 The "ServerStarting" event should now properly crash the server if it fails, so the client will properly exit. A
2013-01-22 10:07:41 -05:00
Christian
c13502c690
Remember to add the new patches!
2013-01-22 09:32:53 -05:00
Christian
6962786e4b
The "ServerStarting" event should now properly crash the server if it fails,
...
so the client will properly exit. Also, added in a "pre-server-start" event
that fires before the worlds are loaded for a save, just for you immibis.
2013-01-22 09:17:04 -05:00
Christian
c40c81924a
Some javadoc fixes
2013-01-21 21:57:48 -05:00
Christian
509b5f8e7e
Javadoc cleanup
2013-01-21 21:37:29 -05:00
Christian
a1e57c068e
Add in patch to change how playerinstance sends TE chunk updates. It should always send just the TEs
...
that changed now, and not "ALL" TEs. Also, added configuration value to change the 64 threshold to a
configurable number
2013-01-20 18:47:04 -05:00
Christian
bdcaa0024a
Update FML: 5ce4e31
...
5ce4e31 Fix breaking change
2013-01-20 18:46:28 -05:00
Christian
825ecf1a7f
Fix breaking change
2013-01-20 17:54:56 -05:00
Christian
8f6963fabf
Merge branch 'worldtype_customize' of https://github.com/ExtrabiomesXL/forge into gh-updates
2013-01-20 15:24:10 -05:00
Christian
a004673567
Merge branch 'master' of https://github.com/CovertJaguar/MinecraftForge into gh-updates
2013-01-20 12:05:11 -05:00
Christian
5ea2d49915
Merge part of PR #375 related to ChunkEvent.Load for the client side
2013-01-20 12:03:42 -05:00
Christian
2e1ea20952
Update FML: a99c488
...
a99c488 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
94282c5 Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
aa822e3 Fix logical error in comment text
26a5b31 FMLLogFormatter: dynamic log level name
2013-01-20 11:42:08 -05:00
Christian
7f4818fd94
Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
2013-01-20 11:31:47 -05:00
Christian
b52c44e42b
Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
2013-01-20 11:31:24 -05:00
Christian
fe2d3244d7
Update licencing information to make clear that forge is allowed to redistribute and automatically
...
download parts of MCP, but this permission is not transitive to people distributing MinecraftForge
source independently of the MinecraftForge project.
Update MCP to 7.26a and FML: 7ad8529
7ad8529 Update MCP to MCP7.26a and refresh MCP names
15534ed Update address of the FML repository to the new location in all the files
a14ab91 Update license text to make clear that FML is not a way to sidestep MCP licensing.
2013-01-20 10:58:07 -05:00
Christian
2c58102515
Update MCP to MCP7.26a and refresh MCP names
2013-01-20 10:30:36 -05:00
Christian
3ddf9b2382
Update address of the FML repository to the new location in all the files
2013-01-18 21:26:43 -05:00
CovertJaguar
78a3d1a656
Fixed render passes for EntityItems
...
Should be < instead of <=
2013-01-18 12:06:29 -08:00
bspkrs
cb769265f0
Fix logical error in comment text
2013-01-16 23:49:09 -05:00
Christian
d576691bfa
Update license text to make clear that FML is not a way to sidestep
...
MCP licensing.
2013-01-15 16:54:26 -05:00
LexManos
875709931c
Bump major and minor version numbers to mark 1.5, it's gunna break everything. Should be a compileable 1.5 build.
2013-01-12 20:44:31 -08:00
LexManos
1155235d92
Fix check in getItem() to allow lowest item ID #361
2013-01-12 16:30:08 -08:00
LexManos
2c974a55ac
Update FML:
...
New scripts for signing jars, and repackging source folders.
Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in all languages now (assumes UTF-8)
Fix incorrect end length calculation. Closes #161 Thanks BStramke!
2013-01-12 16:29:48 -08:00
LexManos
8bc11fbb27
Merge pull request #370 from CovertJaguar/snapshot15
...
MCL Update
2013-01-12 15:30:53 -08:00
Christian
180173fa94
Fix mcp conf md5 signatures for the snapshot
2013-01-12 14:25:03 -05:00
CovertJaguar
46394174c5
MCL Update
2013-01-12 11:10:39 -08:00
LexManos
ea57a46227
Removed some dead code, We don't bind custom tessellators
2013-01-12 05:24:16 -08:00
LexManos
4ea34fe6af
First patches updae to 1.5, Many rendeirng related changes, most notibly removed Item/Block's getTextureFile() functions.
2013-01-12 05:12:10 -08:00
LexManos
c229018c9e
Updated FML and at config for 1.5 snapshot
2013-01-12 00:06:37 -08:00
LexManos
3fc95b71e2
Update patche for jad-style names.
2013-01-11 23:46:08 -08:00
donington
3e4ed24750
FMLLogFormatter: dynamic log level name
...
FMLLogFormatter now uses getLocalizedName or getName for log level name
Changes to be committed:
modified: common/cpw/mods/fml/relauncher/FMLLogFormatter.java
2013-01-12 00:42:36 -05:00
Christian
334e386b56
Temporary hosting
2013-01-12 00:38:42 -05:00
Christian
c048ec7aef
Another packaging update. I think we're done now.
2013-01-12 00:33:32 -05:00
Christian
3e5a3fb0e4
Fix modlist to use the new texture binding functions, i think
2013-01-12 00:27:11 -05:00
Christian
59af780c91
A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone
2013-01-12 00:17:35 -05:00
Christian
cad228093d
Delete old patches not needed anymore
2013-01-11 23:53:14 -05:00
Christian
431372dc5f
Initial patch update for snapshot
2013-01-11 23:47:05 -05:00