c50adf2433
Include the thread state in the potential error handleing for SplashProgress.
2015-06-16 15:26:00 -07:00
64263a9f8e
Throw more descriptive errors when mods attempt to register invalid global entity IDs.
2015-06-14 17:06:00 -07:00
114ac38910
Merge branch '1.7.10'
...
Conflicts:
fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java
fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
2015-06-14 13:57:23 -04:00
1f6086c175
Merge pull request #1935 from superckl/master
...
Fixed two exceptions in BiomeDictionary related to adding new Biome Types.
2015-06-12 17:47:32 -07:00
c84f7a740f
Fixing two IndexOutBoundsExceptions from the BiomeDictionary
2015-06-12 17:08:19 -07:00
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
b3a1548cfa
Cleanup mod state dump to be easier to read by displaying the states in abreviation and placing them before the mod info.
2015-06-09 23:06:06 -07:00
b94c2799ab
Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none.
2015-06-09 22:25:13 -07:00
d4f6e9e419
Quiet CrashReport class pre-loading debug, no flag to re-enable.
2015-06-09 21:37:33 -07:00
847c0246cd
Quiet FMLControlledNamespacedRegistry debug spam by default. Reenable using -Dfml.debugRegistryEntries=true.
2015-06-09 21:33:52 -07:00
b985384fab
Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
2015-06-09 21:31:18 -07:00
851f9c1da6
Cleanup some spammy output.
2015-06-09 21:20:53 -07:00
acbb330214
Bump version for new RB
2015-06-09 17:17:35 -07:00
db7d82a889
Copy over parent's modelSet value in variants as well.
2015-06-09 17:17:23 -07:00
9ef7b13442
Bump version for new RB.
2015-06-09 15:06:42 -07:00
db42d1f532
Merge branch '1.7.10'
2015-06-09 17:57:35 -04:00
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
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
fef959d1e9
Redefine removal value in IRetextureableModel from null to empty string {""} due to ImmutibleMap not allowing null Values. Closes #1927
2015-06-09 12:36:36 -07:00
f62ee5c4f5
Merge pull request #1881 from ganymedes01/master
...
Added a brewing recipe registry system
2015-06-09 12:05:40 -07:00
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
0373920f99
Added a brewing registry system
2015-06-09 14:01:45 -03:00
1ad05f7f22
Missed patch for sign fix.
2015-06-08 16:23:30 -07:00
15a1d4cf0d
Remove worlds from WorldBorder when unloaded tol prevent memory leak, Closes #1923
2015-06-08 16:19:53 -07:00
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
b35aec4347
Attempt to synchronize the state for vanilla client completions and quit the handler if the vanilla
...
thread has already setup the connection. Should fix #1924
2015-06-08 18:24:35 -04:00
ee1e229b66
Change custom payload lock to be buffer itself incase multiple packets use the same backend buffer. Closes #1908
2015-06-07 00:06:00 -07:00
e007f7cf39
Merge pull request #1868 from fuami/ISmartBlockModel_Damage
...
Add Block Breaking Animation for ISmartBlockModels
2015-06-06 03:39:11 +03:00
5cd4564a32
Added Breaking Animation for Smart Models, Checking each layer.
...
Added Layered Smart Render Test.
2015-06-05 19:23:17 -05:00
26bc23602a
Update README.txt
2015-06-05 13:28:07 -07:00
d6bc936ffa
B3D Improvements
...
- fixed keyframe transformation application
- textures are now resolved the same way as in vanilla models
- added the ability to use forge blockstate texture information
- removed unused code from the B3D example
2015-06-04 18:58:42 +03:00
581363fddd
fixed AT missing for getModelBlockDefinition
2015-06-04 18:58:42 +03:00
685a97fd93
Fixed missing variant logging; added the possibility to specify the item variant in the blockstate json.
2015-06-04 18:07:03 +03:00
897d41fa77
Fixed partial variant detection in the forge blockstate loader.
2015-06-04 16:59:18 +03:00
5064d33519
Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json.
2015-06-03 23:16:25 -07:00
107e760aa3
Merge pull request #1912 from clienthax/master
...
Add missing forge patch from 1.8 port
2015-06-03 19:53:01 -07:00
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
63f2300794
Fix up the client/server fluid race condition that could cause the game to bail when an SSP game connects.
...
There's still a teeny gap, but it's MUCH less prominent than it was before.
2015-06-03 19:26:53 -04:00
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
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
950da28d54
Fixed missing import in last merge.
2015-06-02 16:32:10 -07:00
e2dc863086
Merge branch '1.7.10'
...
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
2015-06-02 07:30:44 -04:00
f8cb411df1
So we can't print a lot of unicode in the splash screen, so restrict to a hard subset we know we CAN print, closes #1910
2015-06-02 07:24:26 -04:00
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
885d7602f9
Allow placing item frames on Solid Block Faces (isSideSolid)
2015-06-01 22:31:55 -05:00
e6eeb03108
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
...
(cherry picked from commit 19d7e16fa6
2015-06-01 17:15:06 -04:00
f088b1b460
Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message.
...
(cherry picked from commit e3211eec04
2015-06-01 17:09:28 -04:00
3c640fa32d
Bump minor version # to 2 because of the fluid changes (mirroring what happening in 1.7.10)
2015-06-01 16:31:16 -04:00
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
bd6630810f
Add in an ItemStackHolder - a way to inject ItemStacks without having to have complex lookup code everywhere.
...
Example: https://gist.github.com/cpw/9af398451a20459ac263
2015-05-30 14:07:54 -04:00
Lex Manos