2fce67c8b7
fixed local-building fail with changelog
2015-06-29 21:56:35 -05:00
a55536c0dc
added jenkins compat tasks
2015-06-29 21:56:35 -05:00
1ae0498534
Added FG2 buildscript + updated for Gradle 2.4
2015-06-29 21:56:35 -05:00
c02c379bed
removed old unnecessary stuff
2015-06-29 21:56:35 -05:00
c5ac5b0264
DeobfuscationData no longer required at dev time
2015-06-29 21:56:35 -05:00
0fb705f8f5
added hardcoded fml version file
2015-06-29 21:56:35 -05:00
bbfae84ee8
removed broken and duplicate AT lines
2015-06-29 21:56:30 -05:00
cab151ec44
Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975
2015-06-26 17:54:38 -07:00
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
44077774be
Fixed error GUIs showing a white screen and replaced a rogue direct GL call.
2015-06-27 01:12:24 +02:00
37b4936e9d
Fix particle texture of the generated item models.
2015-06-27 01:26:59 +03:00
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
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
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
b2033d642c
More descripotive error if Patcher is passed invalid data for vanilla classes.
2015-06-23 20:36:23 -07:00
74501f509f
There's no Map.getOrDefault in java6.
2015-06-23 17:03:19 +03:00
8f65678b99
Vanilla models can now use custom textures. Fixes #1962
2015-06-23 16:52:42 +03:00
510b5523d5
Fixed perspective transformations for item models.
2015-06-23 15:56:18 +03:00
d7c4a06ce8
Fix AT for Block constructor.
2015-06-23 01:26:33 -07:00
1582e401ed
Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator.
2015-06-23 04:43:48 +03:00
bae83e6724
Merge remote-tracking branch 'origin/master'
2015-06-21 22:08:08 -04:00
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
8bb34107f1
Merge pull request #1858 from FlansMods/master
...
Hook for Camera Angles, Including Roll
2015-06-21 11:19:26 -07:00
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
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
2cb971c38f
fix logic for guessing mesa tag in biome dict
2015-06-19 07:04:19 -07:00
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
e519278888
Add TextureManager to loading screen.
2015-06-18 22:17:21 -07:00
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
6527792d06
Add the stitching allocation stage to loading screen.
2015-06-18 20:13:17 -07:00
716dfdae47
Create config folder in SplashProgress if it does not exist.
2015-06-18 20:11:23 -07:00
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
ed09a25c65
Patch line number update. Ignore this.
2015-06-18 18:02:22 -07:00
94dc49e522
Merge pull request #1952 from ganymedes01/master
...
Change permission levels on ore recipes parameters
2015-06-18 11:55:46 -07:00
40bc035d74
Merge pull request #1953 from ganymedes01/patch-1
...
Fixed NPE when calling canBrew
2015-06-18 11:51:48 -07:00
01aac69514
Use Guava instead of Nio for J6 compatibility.
2015-06-18 11:48:14 -07:00
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
ab548afbfb
Change permission levels on ore recipes parameters
2015-06-18 13:21:00 -03:00
f2eec981ff
Merge pull request #1922 from RainWarrior/model-fluid2
...
1.8 model fluid renderer
2015-06-18 14:29:22 +03:00
07038f8342
Added fluid renderer.
2015-06-18 14:26:53 +03:00
f59b0a2932
Make Item.shouldCauseReequipAnimation is bit more precise and copy over the new item for rendering even if the animation is diabled.
2015-06-17 20:33:35 -07:00
030084f2b3
Add vanilla block rotation support back in for certain blocks that were missed in 1.8 update. Closes #1903
2015-06-17 17:28:18 -07:00
bf63879a92
Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader
...
Bugfix for B3DLoader
2015-06-17 16:52:08 -07:00
ed8b8bcf8f
Merge pull request #1932 from cheeserolls/patch-1
...
Fix incorrect block position in BlockReed canPlaceBlockAt
2015-06-17 16:48:42 -07:00
1dc7a80d4f
Merge pull request #1506 from mezz/GuiScreenInputEvents
...
Add GuiScreenEvents for keyboard and mouse input
2015-06-17 16:45:41 -07:00
87b55860af
Merge pull request #1781 from ShetiPhian/Block.getPickBlock
...
Player sensitive version of Block.getPickBlock
2015-06-17 16:37:03 -07:00
453ec39496
Add Item.shouldCauseReequipAnimation to allow modders more control over the 'Reequip' animation.
2015-06-17 16:36:41 -07:00
6ec1ec2575
Fixed compile issues with irtimaled's PR.
2015-06-17 16:01:33 -07:00
e7724c13cc
Fixed Wavefront Object Importer reading files with integer values. Closes #1651 , #1654
2015-06-17 15:48:22 -07:00
38a85280de
Make FML Gui classes use GlStateManager. Closes FML#615
2015-06-17 15:16:48 -07:00
AbrarSyed