keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
5043 commits 1 branch 2 tags 103 MiB
Commit graph

5043 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
LexManos
637e2c6f56 Merge pull request #1972 from bonii-xx/StateMapDomainFix 
Fix StateMap always mapping properties to the "minecraft" domain
 2015-06-26 04:03:25 -07:00
Lex Manos
2bfa1ffc05 Add debug for max texture size and output when Texture Atlas can not stitch all textures. 2015-06-26 03:32:09 -07:00
Bernhard Bonigl
e55ee43fd5 Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions. 2015-06-26 10:29:10 +02:00
cpw
204cb16bc4 ObjectHolder works great, but it should be a lot less spammy about failed lookups. They're usually mod options. 2015-06-25 14:41:45 -04:00
diesieben07
ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update 2015-06-25 19:09:32 +02:00
Starbuck Johnson
fe2c4c569d Fix harvest logic running in addition to shearable logic 2015-06-24 14:28:47 -05:00
Lex Manos
b2033d642c More descripotive error if Patcher is passed invalid data for vanilla classes. 2015-06-23 20:36:23 -07: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
cpw
bae83e6724 Merge remote-tracking branch 'origin/master' 2015-06-21 22:08:08 -04:00
cpw
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
LexManos
8bb34107f1 Merge pull request #1858 from FlansMods/master 
Hook for Camera Angles, Including Roll
 2015-06-21 11:19:26 -07:00
cpw
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
LexManos
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
larman
2cb971c38f fix logic for guessing mesa tag in biome dict 2015-06-19 07:04:19 -07:00
Lex Manos
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
Lex Manos
e519278888 Add TextureManager to loading screen. 2015-06-18 22:17:21 -07:00
Lex Manos
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
Lex Manos
6527792d06 Add the stitching allocation stage to loading screen. 2015-06-18 20:13:17 -07:00
Lex Manos
716dfdae47 Create config folder in SplashProgress if it does not exist. 2015-06-18 20:11:23 -07:00
Lex Manos
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
Lex Manos
ed09a25c65 Patch line number update. Ignore this. 2015-06-18 18:02:22 -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
Fry
f2eec981ff Merge pull request #1922 from RainWarrior/model-fluid2 
1.8 model fluid renderer
 2015-06-18 14:29:22 +03:00