James
589465bb81
Fix faulty Channel name
2015-08-21 16:06:07 -07:00
cpw
b211aca5ce
Merge branch 'fg2'
2015-08-20 12:27:20 -07:00
LexManos
b45fd787f3
Merge pull request #1969 from diesieben07/blockhighlight
...
Re-introduce RenderBlockOverlayEvent
2015-08-05 11:48:53 -07:00
cpw
c2523c685a
FML's metabolic processes are now history. FML's off the twig. FML's kicked the bucket, FML's shuffled off this mortal coil,
...
run down the curtain and joined the bleedin' choir invisible!! THIS IS AN EX-PROJECT!
2015-08-02 00:20:19 -04:00
cpw
614bbcb0da
FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace.
2015-08-01 23:51:40 -04:00
cpw
5045d8df68
Merge branch '1.7.10'
2015-08-01 20:30:22 -04: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
2a85ab0eab
Merge pull request #2017 from liach/add-enum
...
Add hook for adding EnumPlantType and fixed npe in BiomeType
2015-07-24 17:08:16 -07:00
Zaggy1024
e580d3b6b6
Fixed a Forge blockstates json removing models causing an NPE in the loader.
...
Fixed the deep clone of a V1 Variant not cloning the submodels properly.
2015-07-24 13:20:10 -05:00
Ruben Taelman
0cf1f0d51c
Fix source block check for BlockFluidClassic
2015-07-21 10:51:53 +02:00
liach
e2ee54a27d
Add an EnumHelper hook and fixed an issue
2015-07-14 08:55:51 +08:00
cpw
8636eb1883
Wake up the FluidRegistry before any mods start loading. Should stop mods claiming to own water or lava (depending on who accessed
...
FluidRegistry first)
2015-07-09 16:53:31 -04:00
cpw
50677ad87a
Actually rebuild the fluidNames each rebuild, don't just try and force changes in. Should fix #1973
2015-07-09 16:40:51 -04:00
RainWarrior
c4f370a7e6
Custom transformations in forge blockstate json.
2015-06-30 21:37:11 +03:00
LexManos
7a733d635e
Merge pull request #1974 from Lunatrius/white-screen-fix
...
Fixed error GUIs showing a white screen
2015-06-26 16:16:01 -07:00
Lunatrius
44077774be
Fixed error GUIs showing a white screen and replaced a rogue direct GL call.
2015-06-27 01:12:24 +02:00
Fry
37b4936e9d
Fix particle texture of the generated item models.
2015-06-27 01:26:59 +03:00
diesieben07
ebef4553f3
Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update
2015-06-25 19:09:32 +02:00
RainWarrior
74501f509f
There's no Map.getOrDefault in java6.
2015-06-23 17:03:19 +03:00
RainWarrior
8f65678b99
Vanilla models can now use custom textures. Fixes #1962
2015-06-23 16:52:42 +03:00
RainWarrior
510b5523d5
Fixed perspective transformations for item models.
2015-06-23 15:56:18 +03:00
RainWarrior
1582e401ed
Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator.
2015-06-23 04:43:48 +03:00
LexManos
8bb34107f1
Merge pull request #1858 from FlansMods/master
...
Hook for Camera Angles, Including Roll
2015-06-21 11:19:26 -07:00
larman
2cb971c38f
fix logic for guessing mesa tag in biome dict
2015-06-19 07:04:19 -07:00
LexManos
94dc49e522
Merge pull request #1952 from ganymedes01/master
...
Change permission levels on ore recipes parameters
2015-06-18 11:55:46 -07:00
LexManos
40bc035d74
Merge pull request #1953 from ganymedes01/patch-1
...
Fixed NPE when calling canBrew
2015-06-18 11:51:48 -07:00
Lex Manos
01aac69514
Use Guava instead of Nio for J6 compatibility.
2015-06-18 11:48:14 -07:00
ganymedes01
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
ganymedes01
ab548afbfb
Change permission levels on ore recipes parameters
2015-06-18 13:21:00 -03:00
RainWarrior
07038f8342
Added fluid renderer.
2015-06-18 14:26:53 +03:00
LexManos
bf63879a92
Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader
...
Bugfix for B3DLoader
2015-06-17 16:52:08 -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
6ec1ec2575
Fixed compile issues with irtimaled's PR.
2015-06-17 16:01:33 -07:00
Lex Manos
e7724c13cc
Fixed Wavefront Object Importer reading files with integer values. Closes #1651 , #1654
2015-06-17 15:48:22 -07:00
LexManos
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
xxmicloxx
b45c90ceb8
Bugfix for B3DLoader
2015-06-17 19:48:51 +02:00
Lex Manos
e94288bbb1
Fixup model loading errors not being printed by making ICustomModelLoader.loadModel propogate IOExceptions as needed.
2015-06-16 16:03:10 -07:00
cpw
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
superckl
c84f7a740f
Fixing two IndexOutBoundsExceptions from the BiomeDictionary
2015-06-12 17:08:19 -07:00
Lex Manos
b94c2799ab
Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none.
2015-06-09 22:25:13 -07:00
Lex Manos
d4f6e9e419
Quiet CrashReport class pre-loading debug, no flag to re-enable.
2015-06-09 21:37:33 -07:00
Lex Manos
acbb330214
Bump version for new RB
2015-06-09 17:17:35 -07:00
Lex Manos
db7d82a889
Copy over parent's modelSet value in variants as well.
2015-06-09 17:17:23 -07:00
Lex Manos
9ef7b13442
Bump version for new RB.
2015-06-09 15:06:42 -07:00
cpw
db42d1f532
Merge branch '1.7.10'
2015-06-09 17:57:35 -04: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
Lex Manos
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
LexManos
f62ee5c4f5
Merge pull request #1881 from ganymedes01/master
...
Added a brewing recipe registry system
2015-06-09 12:05:40 -07:00
James