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
LexManos
edcb45640f
Merge pull request #2069 from simon816/profile-request-fix
...
Use already provided profile for the player's own skin
2015-09-01 16:32:07 -07:00
simon816
d61a55b661
Use already provided profile for the player's own skin
2015-08-31 03:28:59 +01: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
Björn Zeutzheim
ac5c7124de
Fix possible crash in EventBus
...
There is currently no way to check if an event handler has been registered or not.
But when trying to unregister a not-registered event handler, Minecraft crashes with a NullPointerException.
This is a simple fix to prevent such crashes.
2015-08-31 03:39:33 +09:00
cpw
57d575f941
More cleanup of the default eclipse workspace. The project is now called "MDKExample" not "Minecraft".
...
The project tree is now contemporary, instead of a copy from 1.5.x era MC. The launches are cleaned up, and refer to
a better default "runDir" of "run" rather than "eclipse".. Updating to FG2.0.1 which will contain relevant binary fixes.
2015-08-26 21:57:31 -04:00
cpw
d41e51f47b
Fix eclipse workspace inside the mdk - don't run it through the tokenconverter. Also add in CREDITS-fml.txt to the MDK - it's still required.
2015-08-26 13:57:51 -04: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
Lex Manos
4b299529b7
Update gradle wrapper and fix changelog task.
2015-08-22 17:57:12 -07:00
James
589465bb81
Fix faulty Channel name
2015-08-21 16:06:07 -07:00
cpw
0d320e2e31
Fix crowdin again. Run, jenkins, for god's sake, run!
2015-08-21 09:52:33 -07:00
cpw
4903febd96
Fix crowdin task. Good luck jenkins, lets roll!
2015-08-21 09:43:30 -07:00
cpw
bbe96a3577
Fix ciWriteBuildNumber task. Ugly, but it works.
2015-08-20 13:42:58 -07:00
cpw
b211aca5ce
Merge branch 'fg2'
2015-08-20 12:27:20 -07:00
cpw
58ab3de7c1
Remove patches
2015-08-20 12:14:02 -07:00
laci200270
ba8ae53867
Update FMLSecurityManager.java
2015-08-19 20:27:42 +02:00
cpw
7e600c0dd8
Fix packaging the gradle wrapper properly. There is still a problem with
...
the MDK- it fails to run setupDecompWorkspace.
Filed an issue at ForgeGradle, since this seems to be something FG2 shouldn't
be doing, but is?
https://github.com/MinecraftForge/ForgeGradle/issues/235
2015-08-15 10:16:00 -07:00
cpw
9a0a00c7a4
Trying to fix the MDK to include gradle wrapper, but the gradle-wrapper.jar is
...
corrupted. @AbrarSyed can you take a look?
2015-08-15 09:56:56 -07:00
cpw
91927e6bc7
The final nail in the coffin. BYE!
2015-08-13 23:07:53 -07:00
cpw
fc045f210d
Fix MDK task - it now runs.
2015-08-13 23:07:17 -07:00
LexManos
eecc691cdf
Merge pull request #2072 from AbrarSyed/fg2
...
Added MDK package
2015-08-09 20:35:50 -07:00
AbrarSyed
7a6557a9e2
added MDK package
2015-08-09 20:30:31 -05: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
dfd62a3bd8
Vestigal fml-ectomy.
2015-08-02 00:03:47 -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
AbrarSyed
9908310384
fixed deployment credentials
2015-08-01 14:08:04 -05:00
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
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
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
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
LexManos
b8fe3913e9
Merge pull request #2044 from rubensworks/enumfacing-server
...
Remove SideOnly's from EnumFacing allowing full class to be used on both sides.
2015-07-23 10:58:17 -07:00
Ruben Taelman
04d4b2cf76
Make EnumFacing events available server-side
2015-07-23 16:51:45 +02:00
LexManos
81bb69b6c9
Merge pull request #2035 from rubensworks/master
...
Fix source block check for BlockFluidClassic
2015-07-21 16:43:44 -07:00
Ruben Taelman
0cf1f0d51c
Fix source block check for BlockFluidClassic
2015-07-21 10:51:53 +02:00
cpw
c308a47124
Cherry pick some changes from 1.8 for inner class discovery, also fix the negativecache. Closes #1872
2015-07-18 12:47:31 -04:00
LexManos
cd313c195b
Merge pull request #2023 from diesieben07/entity-pick
...
Allow the new entity eggs to be created via middle-click on an Entity while in creative mode.
2015-07-16 11:33:01 -04:00
diesieben07
9f571ff15d
Allow the new entity eggs to be created via middle-click
2015-07-16 14:13:48 +02:00
liach
e2ee54a27d
Add an EnumHelper hook and fixed an issue
2015-07-14 08:55:51 +08:00
cpw
0f456b4684
Be a little bit more helpful when the ObjectHolder misses. Should help figure out what is going in in #2006
2015-07-09 17:05:20 -04: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
