Commit Graph

1071 Commits

Author SHA1 Message Date
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 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 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 c40c81924a Some javadoc fixes 2013-01-21 21:57:48 -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 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 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
CovertJaguar 78a3d1a656 Fixed render passes for EntityItems
Should be < instead of <=
2013-01-18 12:06:29 -08: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
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
LexManos 3a9c7b4532 Added event hooks to control to allow mod control of mob spawning. PR: #337
Deprecated LivingSpecialSpawnEvent in favor of new LivingSpawnEvent.SpecialSpawn
2013-01-01 22:20:30 -08:00
LexManos 3e484deafc Fixed incorrect lighting in some cases. Closes issue #349 2013-01-01 21:54:25 -08:00
LexManos c523592522 Added getter for Metadata smelting list, because, why not.. PR: #352 2013-01-01 21:53:41 -08:00
LexManos 170585960b Some small code cleanups. 2013-01-01 20:57:45 -08:00
LexManos c96b923e1c Fixed issue where ChunkPriderEvent.InitNoiseField used the wrong sizeY value. 2013-01-01 20:55:37 -08:00
LexManos 9fe0b4dfba Fix issue where dungeon loot table had wrong values. 2013-01-01 20:54:55 -08:00
Christian 53c579b8d2 Update FML:6f1b762
6f1b762 Move server stopped *after* the server has actually stopped. *sigh*
2012-12-31 11:21:36 -05:00
Christian 5e4315415d Update FML:d9bfb29
d9bfb29 Add in a "server stopped" event
2012-12-31 00:03:09 -05:00
Christian f594109b30 Attempt to resolve the entity concurrency issue, by simply deferring unload
to the next tick
2012-12-30 23:26:04 -05:00
Christian 937c84090f Update FML:6fc7bc4
6fc7bc4 Add in some classloader debugging information: use fml.debugClassLoading=true as a system property to track down prob
2012-12-30 22:56:04 -05:00
Christian e2dc263f12 Fix noisy exception logging 2012-12-30 21:30:48 -05:00
Christian e4a1693495 Fix a missed patch and cleaned up other patches
Rollback a method name change that breaks a lot of mods
Update FML: fb701cd
fb701cd Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1
2012-12-29 00:29:15 -05:00
Christian 19347c5322 Update for MC 1.4.7
Update FML: f7cc50b
2012-12-28 12:06:56 -05:00
LexManos 0c5563fbf5 Attempt a fix for the new chunk compression changes. 2012-12-27 22:13:46 -08:00
Christian 2ad434fda4 Update FML:1a232cf
1a232cf Fix multiple GUI containers for ML containers. Sorry ultimatechest that this fix took so long, a bug report at
853f54b Log if there's a problem reading the class bytes
2012-12-27 23:19:12 -05:00
LexManos 46440588fe Fix mobs spawning on inverted slabs/stairs. 2012-12-27 13:50:13 -08:00
Scott Killen 16543840a4 Add ability to WorldTypes to display the 'Customize' button and react to it 2012-12-26 11:35:49 -05:00
LexManos 081ec4b70a Fixed order <.< you saw nothing. 2012-12-25 22:28:16 -08:00
LexManos a042453690 Use nanoTime instead of currentTimeMillis for potential performance increase. 2012-12-25 22:23:23 -08:00
LexManos 91c8ca5379 Fixed typo in dungeon loot 2012-12-25 22:03:11 -08:00
LexManos 1a54bcd3dc Fixed EntityMinecard missed patch, Issue #338 2012-12-25 22:02:57 -08:00
LexManos 263e919384 Fixed issue with Efficancy enchatment when connected to vanilla servers. 2012-12-25 22:02:30 -08:00
Christian da1679a061 Merge branch 'Uristqwerty-master' 2012-12-25 22:11:42 -05:00
Christian 5fef1d5e9b Merge branch 'master' of https://github.com/Uristqwerty/MinecraftForge into Uristqwerty-master 2012-12-25 22:11:26 -05:00
Christian 7553f98367 Protect deflation with a simple semaphore. Should close #336 2012-12-25 22:06:20 -05:00
LexManos 58dc621fb7 Update FML: Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent 2012-12-25 16:15:35 -08:00
Uristqwerty 09ab39a238 Force parent ListenerListInsts to rebuild.
Without this change, it is possible (and, in fact, nearly guaranteed) for lists to rebuild endlessly if a parent list is marked as needing a rebuild but never actually read. This change forces the parent list(s) to rebuild as well, resulting in a significant performance increase and smoother framerate due to greatly reduced GC activity.
2012-12-24 20:40:09 -05:00
Christian 81f0de81ea Update FML: 7e6456d
7e6456d Fix a message delivery issue in IMC
664ebda Some tweaks for signing and ID matching
2012-12-24 10:03:11 -05:00