keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
1418 commits 1 branch 2 tags 103 MiB
Commit graph

1418 commits

This branch
This branch
All branches
Author SHA1 Message Date
LexManos
411696f6b8 Merge MC 1.5.1 branch to master. 2013-03-21 04:24:44 -07:00
LexManos
727c042a0e Updated FML: 
MinecraftForge/FML@625da6492d Fix install.py --mcp-dir option. Fixes #204.
MinecraftForge/FML@687d3c059d Merge pull request #204 from agaricusb/fix-mcpdir
 2013-03-20 18:49:36 -07:00
LexManos
342a33c142 MinecraftForge/FML@aaf02ea2ac Updated for new PR client jar. 2013-03-20 09:05:58 -07:00
LexManos
3d9629013b Update to 1.5.1 Pre-Release: 
MinecraftForge/FML@9565529baf Updated to latest MCP and Minecraft 1.5.1 Pre-release.
MinecraftForge/FML@a573faf92d Someone derped up this function bad, revert name.
 2013-03-19 18:09:48 -07:00
LexManos
8aca6b4193 Updated FML: 
MinecraftForge/FML@3c346247e1 Fix NPE with CoreMods who do not have the new MCVersion annotation.
 2013-03-19 13:49:31 -07:00
LexManos
f30f7cb4ab Change placement of ChunkDataEvent.Save call to apply before sending to worker thread. 2013-03-18 14:24:07 -07:00
Christian
8ab1e918f6 Updated FML: 
MinecraftForge/FML@5cc90f060c Fix the logger to treat newlines better, hopefully. Closes #199
MinecraftForge/FML@5e3af8ac0e Use the relaunch log, for class circularity safety.
MinecraftForge/FML@ce949e6099 Support simple mc version test in coremods, only effective through jar loading. Also, log some more data about the environment.
 2013-03-18 08:04:05 -04:00
LexManos
2395699afd New TextureStitchEvents called before and after a TextureMap gathers and stitches textures together. 
Also added a config option to diable the writing of resulting stitched textures to disc. Default disables the writing.
 2013-03-17 20:07:30 -07:00
LexManos
a964725d46 Updated FML: 
MinecraftForge/FML@24022ab6ba Added comments to note FML-only methods
MinecraftForge/FML@8905237306 Merge pull request #200 from bspkrs/patch-2
MinecraftForge/FML@577b19c1cf Fix potential NPE in class loading and add extra debug information.
 2013-03-17 12:01:41 -07:00
LexManos
458a79611b Fix placing of certian items on Redstone Blocks. 2013-03-16 23:06:58 -07:00
LexManos
71127d1cc0 Fix equipment slots for items when right clicked, and dispensed using a dispensor. 2013-03-16 22:11:55 -07:00
LexManos
a30584cb64 Fix logic inversion that allowed SnowMen to create snow on hoppers. 2013-03-16 12:50:57 -07:00
LexManos
7588bec62e Prevent pistons from generating snowballs. 2013-03-16 12:50:30 -07:00
LexManos
6636a2913e Merge pull request #460 from LepkoQQ/master 
Shaped Ore Recipe mirroring issue
 2013-03-16 11:27:22 -07:00
Christian
d52160919d Fix multipass item rendering so that it uses the right spritesheet for the item. 2013-03-16 13:44:32 -04:00
LepkoQQ
f1b32126c5 Fix ShapedOreRecipe checking mirrored recipes 2013-03-16 11:57:11 +01:00
LexManos
304421a4c9 Merge pull request #459 from ChildWalrus/sleep 
Made some sleep-related fields public to allow fixing of sleeping bug in new dimensions
 2013-03-15 21:32:30 -07:00
LexManos
90698d64b6 Fix Activator rails activating TNT carts, closes #458 2013-03-15 21:20:29 -07:00
LexManos
66a2081d2e Merge pull request #455 from Corax/patch-1 
Update ForgeDummyContainer.java
 2013-03-15 20:28:02 -07:00
ChildWalrus
3e6ca3a740 Made WorldServer.allPlayersSleeping public 
Made EntityPlayer.sleepTimer public

Sleep changes
 2013-03-15 21:54:06 +00:00
Christian
ed8d51b021 Updated FML: 
MinecraftForge/FML@c5d5f4e516 Fix AllPublic access transformer not affecting methods. Should fix modloader compatibility
 2013-03-14 16:00:40 -04:00
Corax
de0910b4fb Update ForgeDummyContainer.java 2013-03-14 10:02:17 +01:00
LexManos
8f5f4f7385 Updated FML: 
MinecraftForge/FML@4762d4d8ef Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
MinecraftForge/FML@6370c242f0 OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract
 2013-03-13 13:15:39 -07:00
LexManos
df1e32d7db Remove the block if TE errors. 2013-03-13 12:40:45 -07:00
LexManos
62cb053d5f Add config toggle to atempt to remove TileEntities and Entities that error during there update without fully crashing the server, use at your own risk. Closes #424 2013-03-13 12:20:57 -07:00
Christian
981310c5a3 Updated FML: 
MinecraftForge/FML@8f2dbf7046 Fix up stupid derp in IMC code: actually reset the IMC list after each delivery. Fixes a bunch of mods. Sorry everyone.
 2013-03-13 15:11:07 -04:00
LexManos
95a7ec3f08 Merge pull request #449 from iChun/patch-5 
[Bugfix] One should not assume an item would use the item spritesheet.
 2013-03-13 11:53:50 -07:00
LexManos
58ad89ca90 Fix for nether quartz not generating in the nether, Closes #454 2013-03-13 11:51:36 -07:00
LexManos
81c00a89c5 Fix RedstoneBlock power issues, Closes #452 2013-03-13 11:49:10 -07:00
LexManos
3b40687f55 Fix bug with rendering one too many passes for ItemEntities Closes #450 2013-03-13 11:48:39 -07:00
LexManos
c471a9a557 Deprecation Sweep in DungeonHooks and fixed wildcard in ChestGenHooks remove function. 2013-03-13 10:55:08 -07:00
iChun
44e690b8de [Bugfix] One should not assume an item would use the item spritesheet. 
Item class has a func to return an int to use terrain.png or items.png. This makes forge take account of it.
 2013-03-13 20:36:32 +08:00
LexManos
ff0340f5b4 Fix missed wildcard change in OreDictionary closes #448 2013-03-12 19:44:47 -07:00
LexManos
3e1949fc1c Add call to EntityLiving when counting entities for Spawning Cap. Closes #447 2013-03-12 19:41:51 -07:00
LexManos
2cd9382bfc Move the RenderWorldLastEvent back to before renderHand like it was in 1.4 Closes #444 2013-03-12 19:14:41 -07:00
LexManos
48e95f3d44 Fix RenderItem to work with items that use the terrain texture map that aren't in the block ID range. Close #443 2013-03-12 19:02:18 -07:00
LexManos
31b908473d Fix crash when EnumHelper can't find $VALUES field, log info, and return gracefully. 2013-03-12 18:42:43 -07:00
Christian
40e7798d1e Updated FML: 
MinecraftForge/FML@23ea835fa7 Pass obfuscation status to coremods
 2013-03-12 21:07:25 -04:00
Christian
546ceaa9d8 Updated FML: 
MinecraftForge/FML@d88db6c0cf Fix up deep tree deobfuscation
 2013-03-12 21:06:07 -04:00
Christian
83d4be5a05 Some tweaks to the liquid dictionary, to allow for canonical liquid stacks for things like rendering 2013-03-12 20:33:50 -04:00
LexManos
ce2ebc1d04 Updated FML: 
MinecraftForge/FML@7b722bfcd6 Update MCP for latest PR silent update.
MinecraftForge/FML@c6dab815f4 Missed joined.exc, must fix scripts.
 2013-03-12 15:21:49 -07:00
LexManos
ee1460d8c4 Removed get/setTextureFile from Block, nolonger used. 2013-03-12 14:47:05 -07:00
LexManos
dfdef18d35 Updated FML: 
MinecraftForge/FML@a90504315e Readjust size of mods button when Minecraft Realms button is enabled.
 2013-03-11 16:28:19 -07:00
Christian
529062d73f Fix the oredictionary for the new recipe wildcard value of Short.MAX_VALUE. 2013-03-11 17:43:23 -04:00
Christian
4d6c135182 Updated FML: 
MinecraftForge/FML@3765ceb02d Update MCP, fixes the "broken texture packs" problem.
 2013-03-11 16:37:53 -04:00
Christian
94a0203882 Updated FML: 
MinecraftForge/FML@dab22f5b74 Fix "0 mods" display when installed in forge.
 2013-03-10 12:14:40 -04:00
Christian
811c53e518 Updated FML: 
MinecraftForge/FML@179c504746 Simplify logic in tick start/end
MinecraftForge/FML@29edd242cd Fix coremods without a manifest crashing the game. Closes #181
MinecraftForge/FML@ac16845fc4 Fix demo mode crash. Closes #187
MinecraftForge/FML@984291cee9 Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
MinecraftForge/FML@f647929993 Merge branch 'master' of github.com:Uristqwerty/FML
MinecraftForge/FML@b301e8e4c1 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189
 2013-03-10 01:34:45 -05:00
Christian
4175d2f306 Updated FML: 
MinecraftForge/FML@591e65fa1a Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
MinecraftForge/FML@2a779ec328 Try a different way of remapping the fields. Should work because it's userspace, not relauncher space
MinecraftForge/FML@ca2d8bd834 Fix reflection helper: it needs to unmap the classname to find the field maps.
 2013-03-09 17:59:21 -05:00
Christian
d5edaea88f Updated FML: 
MinecraftForge/FML@485db6be2e Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf.
 2013-03-09 17:21:13 -05:00
Christian
c9f6412392 Updated FML: 
MinecraftForge/FML@25f3fcad46 Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too.
 2013-03-09 15:30:32 -05:00