1582e401ed
Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator.
2015-06-23 04:43:48 +03:00
bae83e6724
Merge remote-tracking branch 'origin/master'
2015-06-21 22:08:08 -04:00
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
8bb34107f1
Merge pull request #1858 from FlansMods/master
...
Hook for Camera Angles, Including Roll
2015-06-21 11:19:26 -07:00
2c24c7618a
Mods that are extracted to the mods dir by unzipping or whatever will now cause the game to crash. Too much info is in the META-INF now,
...
and more will be being added. Extracting to the mods dir just completely breaks that.
2015-06-20 14:47:55 -04:00
240ed53a88
Merge pull request #1956 from lawremi/mesadictfix
...
fix logic for guessing mesa tag in biome dict
2015-06-19 11:25:49 -07:00
2cb971c38f
fix logic for guessing mesa tag in biome dict
2015-06-19 07:04:19 -07:00
7041fbc27e
Time each bar in the loading screen and print it to the log, useful information to see where most time is spent in loading.
2015-06-18 22:18:27 -07:00
e519278888
Add TextureManager to loading screen.
2015-06-18 22:17:21 -07:00
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
6527792d06
Add the stitching allocation stage to loading screen.
2015-06-18 20:13:17 -07:00
716dfdae47
Create config folder in SplashProgress if it does not exist.
2015-06-18 20:11:23 -07:00
c158af902f
New system in EntityRegistry to allow modders to register spawn eggs.
...
For entites that do not use the global ID system.
{Which no mod entity should}
Vanilla spawn eggs will now detect a 'entity_name' entry in it's NBT data and use that for spawning/rendering.
2015-06-18 18:05:12 -07:00
ed09a25c65
Patch line number update. Ignore this.
2015-06-18 18:02:22 -07:00
94dc49e522
Merge pull request #1952 from ganymedes01/master
...
Change permission levels on ore recipes parameters
2015-06-18 11:55:46 -07:00
40bc035d74
Merge pull request #1953 from ganymedes01/patch-1
...
Fixed NPE when calling canBrew
2015-06-18 11:51:48 -07:00
01aac69514
Use Guava instead of Nio for J6 compatibility.
2015-06-18 11:48:14 -07:00
953ddae475
Fixed NPE when calling canBrew
...
Oversight on my part,
If the ingredient doesn't return true in Item.isPotionIngredient, Items.potionitem.getEffects(stack) returns null, causing an NPE to be thrown later on.
This invalidates #1947 .
2015-06-18 13:32:21 -03:00
ab548afbfb
Change permission levels on ore recipes parameters
2015-06-18 13:21:00 -03:00
f2eec981ff
Merge pull request #1922 from RainWarrior/model-fluid2
...
1.8 model fluid renderer
2015-06-18 14:29:22 +03:00
07038f8342
Added fluid renderer.
2015-06-18 14:26:53 +03:00
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
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
bf63879a92
Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader
...
Bugfix for B3DLoader
2015-06-17 16:52:08 -07:00
ed8b8bcf8f
Merge pull request #1932 from cheeserolls/patch-1
...
Fix incorrect block position in BlockReed canPlaceBlockAt
2015-06-17 16:48:42 -07:00
1dc7a80d4f
Merge pull request #1506 from mezz/GuiScreenInputEvents
...
Add GuiScreenEvents for keyboard and mouse input
2015-06-17 16:45:41 -07:00
87b55860af
Merge pull request #1781 from ShetiPhian/Block.getPickBlock
...
Player sensitive version of Block.getPickBlock
2015-06-17 16:37:03 -07:00
453ec39496
Add Item.shouldCauseReequipAnimation to allow modders more control over the 'Reequip' animation.
2015-06-17 16:36:41 -07:00
6ec1ec2575
Fixed compile issues with irtimaled's PR.
2015-06-17 16:01:33 -07:00
e7724c13cc
Fixed Wavefront Object Importer reading files with integer values. Closes #1651 , #1654
2015-06-17 15:48:22 -07:00
38a85280de
Make FML Gui classes use GlStateManager. Closes FML#615
2015-06-17 15:16:48 -07:00
20ea3bc0ce
Merge pull request #1749 from irtimaled/master
...
Copy fortress.dat from the overworld to the Nether. Fixes #1747
2015-06-17 14:23:58 -07:00
b45c90ceb8
Bugfix for B3DLoader
2015-06-17 19:48:51 +02:00
e94288bbb1
Fixup model loading errors not being printed by making ICustomModelLoader.loadModel propogate IOExceptions as needed.
2015-06-16 16:03:10 -07:00
d0902c096e
Cleanup code format in LayerBreakingTest.
2015-06-16 16:01:09 -07:00
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
RainWarrior