LexManos
ebe9b6d4cb
Merge pull request #2022 from simon816/guava-apache-lcl-exclusion
...
Add Guava and Apache to LaunchClassLoader exclusion list on server
2015-10-12 12:29:45 -07:00
darkevilmac
b9f5e152de
Add PlayerSetSpawnEvent
2015-10-10 15:39:27 -07:00
RainWarrior
e280f72cfb
'#' is now added automatically to the beginning of the texture names in B3D models, and the remapping is expected via the blockstate JSON, since it's more reasonable than adding it to the file name in the modelling program or matching the resource location with the filename.
2015-10-03 04:42:35 +03:00
RainWarrior
d71384bc33
Fixes Attributes.transform affecting only 1 vertex.
2015-09-29 02:29:16 +03:00
luacs1998
05f6ede2ea
Fix a possible crash in EventBus
2015-09-27 12:47:37 +08:00
RainWarrior
d70ca1a357
Workaround for MinecraftForge/ForgeGradle#256
2015-09-02 22:01:30 +03:00
cpw
5074f26ccd
FMLNetworkHandler.openGui should not try and open a GUI on a FakePlayer.
...
Fixes #2082 and probably dozens of mod errors. Also, side benefit of the
merged codebase! FML code can ref Forge code!
2015-09-02 13:50:00 -04:00
cpw
b7e8dcff7b
Format a bit better
2015-09-02 13:29:43 -04:00
cpw
5a9129f802
Merge branch 'patch-1' of https://github.com/laci200270/MinecraftForge into laci200270-patch-1
2015-09-02 13:27:42 -04:00
RainWarrior
b175d265b9
Much requested temporary hack for items and TESRs. Context: #1582 , #1597 , #1713 , #2058 and others.
2015-09-02 07:35:24 +03:00
LexManos
e5ee9377fd
Merge pull request #2086 from Vorquel/master
...
Fix faulty channel name checking
2015-09-01 16:32:26 -07:00
simon816
b312584ca4
Add Guava and Apache to LaunchClassLoader exclusion list on server
...
Move exclusions to common place. Less likely to get out of sync
2015-08-31 03:15:30 +01:00
Lex Manos
90a88efd8a
Fixed issue where config folder would not be created before SplashProgress tried to read from it.
...
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
2015-08-22 18:55:32 -07:00
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
laci200270
ba8ae53867
Update FMLSecurityManager.java
2015-08-19 20:27:42 +02: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
9a859f8d5c
Merge branch 'master' of https://github.com/AbrarSyed/MinecraftForge into fg2
2015-08-01 20:55:58 -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
LexManos
d72caa5005
Merge pull request #2047 from Zaggy1024/forgeblockstatesv1fixes
...
Fixed two bugs with the Forge blockstates v1 loader.
2015-07-24 11:28:23 -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
LexManos
5eea9cebae
Merge pull request #1983 from clienthax/patch-1
...
Make layer methods public
2015-07-23 12:13:00 -07: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
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
AbrarSyed
bbfae84ee8
removed broken and duplicate AT lines
2015-06-29 21:56:30 -05: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
Lex Manos
d7c4a06ce8
Fix AT for Block constructor.
2015-06-23 01:26:33 -07: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