Commit graph

1675 commits

Author SHA1 Message Date
Lex Manos
43a6d0da62 Updated FML:
MinecraftForge/FML@e7dd728f95 Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer.
MinecraftForge/FML@82d896a35e Make final transformers actually work on methods as well.
2013-09-19 13:05:15 -07:00
Lex Manos
a525cab5ff Move the Structure data save files to per-world data folders. Vanilla saves them to the global folder which will potentially cause conflicts if two worlds generate 'Villages'. Which in the modded world is highly likely. Refer back to the long standing vanilla issue where nether 'villages' would override the overworlds villages, it's the same situation. 2013-09-18 23:37:23 -07:00
Lex Manos
d39c279203 Make MapGenStructureIO name registration functions public, Any mod that has anything extending StructureStart or StructureComponent must register there classes and create a default (no parameter) constructor. 2013-09-18 20:52:52 -07:00
Lex Manos
0a7095afa9 Unfinalized Item.getIconIndex(ItemStack) 2013-09-18 19:33:28 -07:00
Lex Manos
36672fef83 Actually push the submodule update -.- 2013-09-18 16:18:19 -07:00
Lex Manos
57ea20d083 Bump version for new MC version. 2013-09-18 16:10:55 -07:00
Lex Manos
6c5ef9347c Updated FML:
MinecraftForge/FML@da70cdd35a Update tweaker for new Launcher API
MinecraftForge/FML@352117fd78 Update for new installer and thank you.
MinecraftForge/FML@40a34af431 Merge branch 'master' into newtweak
MinecraftForge/FML@e77d2547ad Update for pre-ninja 1.6.3 update
MinecraftForge/FML@34493b0d99 Update for real 1.6.3 update
MinecraftForge/FML@95afc95b24 Update mcp mod info
MinecraftForge/FML@ff75416a32 Update mc_versions data and commands patch and eclipse workspace
MinecraftForge/FML@8f2e675581 Update the src distro's eclipse workspace.
2013-09-18 16:10:38 -07:00
Christian
60da9094ef Updated FML:
MinecraftForge/FML@81328b6684 Add in support for using a mirror list and provide checksums for packed download of libs
2013-09-15 23:00:07 -04:00
Christian
f9087cb291 Revert "Added a RenderType that allows Map-style rendering w/o inheriting from"
This reverts commit eb4688bf5e.

Conflicts:
	patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
2013-09-14 18:43:18 -04:00
Christian
635f13f825 Fix broken PR from vilml. TEST! 2013-09-14 18:13:58 -04:00
cpw
55830256d3 Merge pull request #784 from viliml/patch-1
Prevent NPE in fluid lookup for block
2013-09-14 11:28:06 -07:00
viliml
ac58bb2f5a Prevent NPE in fluid lookup for block 2013-09-14 20:16:46 +02:00
cpw
a066018c9f Merge pull request #782 from CovertJaguar/patch-1
Allow Fluids to have Rarities
2013-09-14 05:17:34 -07:00
Christian
0bc9138aa4 Fix the divider 2013-09-13 22:57:29 -05:00
CovertJaguar
b626c888b0 Allow Fluids to have Rarities
Used for tool tips.
2013-09-13 20:17:12 -07:00
Christian
492cbc3628 Move stuff around a bit- also tie range and enabled to options. 2013-09-13 22:11:59 -05:00
Christian
32353f0db1 Merge branch 'master' of github.com:Adubbz/MinecraftForge into Adubbz-master 2013-09-13 21:04:54 -05:00
Adubbz
7aa43a4217 Sky colours now smoothly transition
Made transitions even smoother

Sky colours now smoothly transition
2013-09-14 12:00:06 +10:00
Christian
09580515a0 Tweak patch comment 2013-09-13 20:45:30 -05:00
Christian
65165cd41c Merge branch 'mapStyle' of github.com:Matchlighter/MinecraftForge into Matchlighter-mapStyle 2013-09-13 20:11:13 -05:00
Christian
391668114d Merge branch 'master' of github.com:micdoodle8/MinecraftForge into micdoodle8-master 2013-09-13 20:06:50 -05:00
iChun
ae80a7b322 Allows proper raytracing from actual player eye position rather than hardcoded eye heights. 2013-09-13 19:56:28 -05:00
Christian
9093263d8c Merge branch 'fovhook' of github.com:MachineMuse/MinecraftForge into MachineMuse-fovhook 2013-09-13 19:40:19 -05:00
Christian
e008ae3ef1 Updated FML:
MinecraftForge/FML@b5af446d71 Fix sidedness derp in LanguageRegistry.
2013-09-13 19:05:28 -05:00
micdoodle8
9ddb57297f Check if block is air instead of just ID zero when growing from stem block. 2013-09-09 17:53:19 -04:00
Matchlighter
eb4688bf5e Added a RenderType that allows Map-style rendering w/o inheriting from
ItemMap.
2013-09-07 22:50:18 -06:00
Christian
519da32391 The partial tick should be available for all render player events. Weird it wasn't. 2013-09-07 16:25:30 -04:00
Christian
f9728e8f3f Redo harvest event. This time with simpler logic, that should be less liable to weird "missing" stuff. 2013-09-07 00:10:08 -04:00
Christian
25bfc1407b Reverting HarvestEvent, for new implementation 2013-09-06 23:39:48 -04:00
Lex Manos
303bd03533 Fix bug where guis were not closed properly, resulting in signs not having there text set. 2013-09-06 15:27:02 -07:00
Christian
6b54b52ec4 Change trigger calculation so entities get some time to age before refiring the event. 2013-09-06 16:46:44 -04:00
Lex Manos
89becaca02 Create helper apply_patches script and add paramter to change patch output folder. 2013-09-06 13:32:26 -07:00
Christian
d9ca67e162 Change from Cancelable to using a Result. This means you can force despawn mobs you
don't want around anymore. Also, deferred check to once every 20 ticks. May tune it
down further or make it a config if this event is a lag issue.
2013-09-06 16:05:29 -04:00
Daniel García
ff655de27e Create es_ES.lang 2013-09-06 13:28:48 -04:00
MachineMuse
ee0cb12810 Added fov hook
Small formatting changes (opening braces on new line)
2013-09-06 13:25:47 -04:00
Christian
6da6e9da07 Add a cancellable despawn event- allows mods to decide to prevent the despawning
of certain otherwise normally despawnable mobs.
2013-09-06 13:19:51 -04:00
MachineMuse
ad41dfaeaf Small formatting changes (opening braces on new line) 2013-09-05 18:46:05 -06:00
MachineMuse
7a0a7bf8e0 fixed merge 2013-09-05 18:43:27 -06:00
MachineMuse
65551ce233 Added fov hook 2013-09-05 18:39:27 -06:00
Christian
c63efa917d Add some javadoc to the HarvestBlock event. 2013-09-05 16:24:50 -04:00
Christian
7544055fa4 Clean up some formatting. 2013-09-05 13:16:01 -04:00
Christian
cb5b5cde1f Use the dropchance from the event. 2013-09-05 13:01:25 -04:00
Christian
a58a7fd365 Merge branch 'sometweaks' 2013-09-05 12:22:31 -04:00
Christian
99c6662f9d Add in a block reverse lookup for fluids. Closes #749 2013-09-05 12:08:16 -04:00
Christian
ca0e32cfd2 Add a harvestblock event, to allow mods to intercept and change the drops for blocks. Don't abuse this, or we'll have to take safety measures.
Fires for both silktouch and non-silktouch harvesting, and provides the player. Note, you may need to
change your break overrides to pass on the player for best results.
2013-09-05 11:57:27 -04:00
Christian
c84d99aa22 Defer firing CreateDecorator until it's likely mods have had a chance to register their listener. Should close #759 2013-09-05 10:08:02 -04:00
Christian
0443ef5a9e MachineMuse, remember, there's TWO model formats supported! 2013-09-05 09:14:10 -04:00
Christian
e962c2a94d Merge branch 'master' of github.com:jk-5/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-09-05 08:39:15 -04:00
Christian
8c2e171a16 Merge branch 'master' of github.com:mhahn1976/MinecraftForge into sometweaks 2013-09-05 08:26:11 -04:00
Christian
4fb8eb96d0 Merge branch 'french' of github.com:robin4002/MinecraftForge into sometweaks 2013-09-05 08:23:29 -04:00