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 |
|
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 |
|
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 |
|
simon816
|
81eb6a8bb4
|
Fix placing signs with NBT prompting for text
|
2015-07-08 22:27:17 +01:00 |
|
Clienthax
|
97f8c246b8
|
Signed-off-by: Clienthax <clienthax@gmail.com>
|
2015-06-30 22:29:34 +01:00 |
|
Fry
|
20bf76464a
|
Merge pull request #1978 from RainWarrior/model-rotation
Custom transformations in forge blockstate json.
|
2015-06-30 22:14:31 +03:00 |
|
RainWarrior
|
c4f370a7e6
|
Custom transformations in forge blockstate json.
|
2015-06-30 21:37:11 +03:00 |
|
AbrarSyed
|
9ebc77ef22
|
updated installed gradle. not finished
|
2015-06-30 00:14:41 -05:00 |
|
AbrarSyed
|
2fce67c8b7
|
fixed local-building fail with changelog
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
a55536c0dc
|
added jenkins compat tasks
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
1ae0498534
|
Added FG2 buildscript + updated for Gradle 2.4
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
c02c379bed
|
removed old unnecessary stuff
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
c5ac5b0264
|
DeobfuscationData no longer required at dev time
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
0fb705f8f5
|
added hardcoded fml version file
|
2015-06-29 21:56:35 -05:00 |
|
AbrarSyed
|
bbfae84ee8
|
removed broken and duplicate AT lines
|
2015-06-29 21:56:30 -05:00 |
|
LexManos
|
cab151ec44
|
Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975
|
2015-06-26 17:54:38 -07:00 |
|