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

802 commits

Author SHA1 Message Date
Lex Manos
7b18eab02d Fix placing skulls on fence posts. Closes #2055 2015-07-31 15:10:47 -07:00
LexManos
bd4b3debc3 Merge pull request #1968 from modwizcode/master 
Fix harvest logic running in addition to shearable logic
 2015-07-31 12:57:05 -07:00
LexManos
5623634f56 Merge pull request #2048 from shadekiller666/UnlistedPropertyValue 
Fix for ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty preventing block placement.
 2015-07-25 15:12:57 -07:00
shadekiller666
87bbbfafcc Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed. 2015-07-25 14:55:42 -07:00
LexManos
65123c66a0 Merge pull request #2004 from simon816/sign-nbt-fix 
Fix placing signs with NBT prompting for text
 2015-07-24 13:53:27 -07:00
LexManos
5eea9cebae Merge pull request #1983 from clienthax/patch-1 
Make layer methods public
 2015-07-23 12:13:00 -07:00
Ruben Taelman
04d4b2cf76 Make EnumFacing events available server-side 2015-07-23 16:51:45 +02:00
diesieben07
9f571ff15d Allow the new entity eggs to be created via middle-click 2015-07-16 14:13:48 +02:00
simon816
81eb6a8bb4 Fix placing signs with NBT prompting for text 2015-07-08 22:27:17 +01:00
Clienthax
97f8c246b8 Signed-off-by: Clienthax <clienthax@gmail.com> 2015-06-30 22:29:34 +01:00
RainWarrior
c4f370a7e6 Custom transformations in forge blockstate json. 2015-06-30 21:37:11 +03:00
LexManos
637e2c6f56 Merge pull request #1972 from bonii-xx/StateMapDomainFix 
Fix StateMap always mapping properties to the "minecraft" domain
 2015-06-26 04:03:25 -07:00
Lex Manos
2bfa1ffc05 Add debug for max texture size and output when Texture Atlas can not stitch all textures. 2015-06-26 03:32:09 -07:00
Bernhard Bonigl
e55ee43fd5 Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions. 2015-06-26 10:29:10 +02:00
Starbuck Johnson
fe2c4c569d Fix harvest logic running in addition to shearable logic 2015-06-24 14:28:47 -05:00
RainWarrior
8f65678b99 Vanilla models can now use custom textures. Fixes #1962 2015-06-23 16:52:42 +03:00
cpw
bae83e6724 Merge remote-tracking branch 'origin/master' 2015-06-21 22:08:08 -04:00
cpw
16ff1be093 Merge branch '1.7.10' 
Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
	fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
 2015-06-21 21:59:51 -04:00
LexManos
8bb34107f1 Merge pull request #1858 from FlansMods/master 
Hook for Camera Angles, Including Roll
 2015-06-21 11:19:26 -07:00
Lex Manos
4235ca36ea Make TextureMap for items and blocks skip the first pass of loading/stitching textures. 
Should decrease loading times for large packs.
May cause issues with some mods so use -Dfml.skipFirstTextureLoad=false to disable.
 2015-06-18 20:13:31 -07:00
Lex Manos
ed09a25c65 Patch line number update. Ignore this. 2015-06-18 18:02:22 -07:00
Lex Manos
f59b0a2932 Make Item.shouldCauseReequipAnimation is bit more precise and copy over the new item for rendering even if the animation is diabled. 2015-06-17 20:33:35 -07:00
Lex Manos
030084f2b3 Add vanilla block rotation support back in for certain blocks that were missed in 1.8 update. Closes #1903 2015-06-17 17:28:18 -07:00
LexManos
ed8b8bcf8f Merge pull request #1932 from cheeserolls/patch-1 
Fix incorrect block position in BlockReed canPlaceBlockAt
 2015-06-17 16:48:42 -07:00
LexManos
1dc7a80d4f Merge pull request #1506 from mezz/GuiScreenInputEvents 
Add GuiScreenEvents for keyboard and mouse input
 2015-06-17 16:45:41 -07:00
LexManos
87b55860af Merge pull request #1781 from ShetiPhian/Block.getPickBlock 
Player sensitive version of Block.getPickBlock
 2015-06-17 16:37:03 -07:00
Lex Manos
453ec39496 Add Item.shouldCauseReequipAnimation to allow modders more control over the 'Reequip' animation. 2015-06-17 16:36:41 -07:00
Lex Manos
64263a9f8e Throw more descriptive errors when mods attempt to register invalid global entity IDs. 2015-06-14 17:06:00 -07:00
Daniel Howard
16be913abc Fix incorrect block position in BlockReed canPlaceBlockAt 
block.canSustainPlant is called on the wrong block position.  It should be called on the block below (the 'soil' block).
 2015-06-12 10:14:22 +01:00
LexManos
7406e3df9f Merge pull request #1795 from lumien231/ExperienceEvent 
Added LivingExperienceDropsEvent to change how much experience an entity drops
 2015-06-09 13:23:01 -07:00
LexManos
8b50f9ab36 Merge pull request #1907 from johnjohn/master 
Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom ItemMaps
 2015-06-09 12:37:33 -07:00
LexManos
f62ee5c4f5 Merge pull request #1881 from ganymedes01/master 
Added a brewing recipe registry system
 2015-06-09 12:05:40 -07:00
johnjohn
486c0955cf Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom maps 2015-06-09 12:42:45 -06:00
ganymedes01
0373920f99 Added a brewing registry system 2015-06-09 14:01:45 -03:00
Lex Manos
1ad05f7f22 Missed patch for sign fix. 2015-06-08 16:23:30 -07:00
Lex Manos
15a1d4cf0d Remove worlds from WorldBorder when unloaded tol prevent memory leak, Closes #1923 2015-06-08 16:19:53 -07:00
Lex Manos
1b689802a4 Limit Sign text to 384 json characters and strip control codes. This is 1.8.7's Sign fix. Thanks Searge. 2015-06-08 16:19:02 -07:00
Fry
e007f7cf39 Merge pull request #1868 from fuami/ISmartBlockModel_Damage 
Add Block Breaking Animation for ISmartBlockModels
 2015-06-06 03:39:11 +03:00
Fuami
5cd4564a32 Added Breaking Animation for Smart Models, Checking each layer. 
Added Layered Smart Render Test.
 2015-06-05 19:23:17 -05:00
Lex Manos
5064d33519 Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json. 2015-06-03 23:16:25 -07:00
Clienthax
9b53b7e111 Add missing forge patch from 1.8 port 
https://github.com/MinecraftForge/MinecraftForge/blob/1.7.10/patches/minecraft/net/minecraft/client/Minecraft.java.patch#L88
 2015-06-04 01:55:13 +01:00
LexManos
61f9c5a201 Merge pull request #1885 from LexManos/EnhanvedBlockStateJson 
Hook BlockState's Json loading to add support for simplified Forge format.
 2015-06-02 16:52:06 -07:00
Lex Manos
267e1ee62f Hook BlockState's Json loading to add support for simplified Forge format. 
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
 2015-06-02 16:49:56 -07:00
LexManos
41cae458a4 Merge pull request #1911 from AlgorithmX2/ItemFramesOnSolidSurfaces 
Allow placing item frames on Solid Block Faces (isSideSolid)
 2015-06-01 20:45:28 -07:00
AlgorithmX2
885d7602f9 Allow placing item frames on Solid Block Faces (isSideSolid) 2015-06-01 22:31:55 -05:00
cpw
d02636213a Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8 
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	fml/src/main/java/net/minecraftforge/fml/common/Loader.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	patches/minecraft/net/minecraft/item/ItemArmor.java.patch
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/WorldProvider.java.patch
	src/main/java/net/minecraftforge/common/ForgeVersion.java
	src/main/java/net/minecraftforge/common/network/ForgeMessage.java
	src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
	src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
	src/main/java/net/minecraftforge/fluids/FluidRegistry.java
	src/main/java/net/minecraftforge/oredict/OreDictionary.java
 2015-06-01 16:29:34 -04:00
LexManos
f9b1e4e23b Merge pull request #1892 from AlgorithmX2/vanilla_lighting_bug 
Fix Vanilla Lighting Bug - Fixes Top/Bottom Faces interpolation.
 2015-05-26 19:24:37 -07:00
AlgorithmX2
76f8843017 Fix Partial Face Lighting on Top/Bottom Faces ; Vanilla MC-80148 2015-05-26 19:33:56 -05:00
Lex Manos
9fa51447a2 Fixed command exploit with C12 2015-05-25 16:08:42 -07:00
Lex Manos
c608e7c04e Fixes MC-75630 - Exploit with signs and command blocks 2015-05-25 15:28:14 -07:00