Commit graph

1785 commits

Author SHA1 Message Date
Lex Manos
99faaae9f6 Regenerate all patches, No functional change as added this is a formatting change only. 2013-11-18 17:17:45 -08:00
Lex Manos
0999017fda Updated FML:
MinecraftForge/FML@e9a7660cb8 updated samples
MinecraftForge/FML@30894f7afa Merge pull request #307 from AbrarSyed/master
MinecraftForge/FML@c4b8a393f9 Make the working directory the root of the eclipse workspace.
2013-11-18 17:17:22 -08:00
Lex Manos
34f4b58f69 Update run configs. 2013-11-18 16:19:31 -08:00
Lex Manos
e9af710cf4 Fix for new FML, and publish to maven local 2013-11-17 12:01:31 -08:00
AbrarSyed
74104fe5d0 Update forge 2013-11-17 12:07:22 -06:00
Lex Manos
45cc0bd87c Fix NPE in FakePlayers when they are created in a purely client side environment. To remove in 1.7 as FakePlayers should be used for server side interaction with the world on a player's behalf, not for client rendering. 2013-11-16 15:26:52 -08:00
Lex Manos
77c5caffd5 Fix NPE on specific tile entities when the block break event is canceled. Closes #863 2013-11-16 15:26:00 -08:00
AbrarSyed
f5335d59cc added buildSrc to the gitIgnore 2013-11-14 20:22:31 -06:00
Christian
28abe2cc3c Updated FML:
MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
2013-11-13 19:16:24 -05:00
Christian
745d601831 Updated FML:
MinecraftForge/FML@da72640c7e Way to go, missing import. *sigh*
2013-11-13 07:46:04 -05:00
Christian
9fd39ebe79 Updated FML:
MinecraftForge/FML@b7f34629c3 Don't try and open GUIs on the server.
2013-11-12 18:05:04 -05:00
Christian
4f05808b8e Don't send openGui commands from the fakeplayer. Fixes thaumcraft and probably others. 2013-11-12 17:33:24 -05:00
Christian
c8e249f919 Updated FML:
MinecraftForge/FML@6af42bc656 Add in null protection for client/server sides of handleChat
2013-11-12 17:22:20 -05:00
LexManos
7adccac8ec Merge pull request #855 from CovertJaguar/patch-4
Fix Water/Lava Fluid Localization
2013-11-12 10:00:37 -08:00
CovertJaguar
0a12840e68 Fix Water/Lava Fluid Localization 2013-11-12 01:05:13 -08:00
Lex Manos
1bd3e96e6e Noop out FakePlayer.addStat. 2013-11-11 13:15:06 -08:00
AbrarSyed
cdbdd0d6fb fixed versioning and stuff 2013-11-10 00:54:57 -06:00
AbrarSyed
743d10d50e Step 3: The Rebirth 2013-11-09 21:48:53 -06:00
AbrarSyed
797399ff7f Step 2: The Reformation 2013-11-09 15:57:08 -06:00
AbrarSyed
9332673944 update FML for gradle changes 2013-11-09 15:53:05 -06:00
AbrarSyed
f9563e5a34 Step 1: The Purge 2013-11-09 15:44:50 -06:00
Christian
84fd2a147e Updated FML:
MinecraftForge/FML@3d25b4e793 Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate. Closes #300
2013-11-09 14:36:42 -05:00
LexManos
cfd368e18f Merge pull request #852 from MinecraftForge/breakevent
Merge BreakEvent branch, as nobody has told me that it breaks everything. And in prep from 1.7.
2013-11-09 00:43:58 -08:00
Christian
a9c795b54c Updated FML:
MinecraftForge/FML@f4532410ec Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.
2013-11-06 16:19:40 -05:00
Christian
8fb4546437 Updated FML:
MinecraftForge/FML@8f87021b0f Fix derp with custom properties. They work now!
2013-11-05 22:24:36 -05:00
Christian
d316d74933 Updated FML:
MinecraftForge/FML@bc57ff9e83 Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's
2013-10-31 09:40:18 -04:00
Christian
ebfaf83bd9 Updated FML:
MinecraftForge/FML@de8ab934d8 Fix up duplicate entries
2013-10-30 22:46:40 -04:00
Christian
a103fbc0e6 Updated FML:
MinecraftForge/FML@81fe1c9682 Add in an API marker for API type packages. This does several things: 1. Packages marked as API will generate a new "modid" (the provides) that can be depended on. 2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker) will get an implicit dependency on the API package. 3. The API package itself will get a soft dependency on the "owner" package.
2013-10-30 22:30:02 -04:00
Lex Manos
a4fa417114 Add new recipe sorter that is called after all mods are initalized. This is disabled by default in 1.6 to not break current worlds as it may change machine's recipy outputs. Will enable by default in 1.7. Players may enable it in the forge config. 2013-10-30 14:08:03 -07:00
LexManos
a47cca7e42 Merge pull request #841 from XCompWiz/biomecheck
Adds a Check to prevent Biome Replacement
2013-10-27 22:14:54 -07:00
XCompWiz
80ac3017bd Adds a Check to prevent Biome Replacement
Splits the BiomeGenBase constructor to create one which takes a flag
that indicates whether to insert the biome object into the biomeList
array.  The standard constructor calls the new one with the default of
true.  This allows biome wrapper-objects to exist.
2013-10-28 07:11:17 +02:00
Lex Manos
ec517d5f28 Format strings properly in MC's internal logger. Fixes resource pack case warnings. 2013-10-27 11:00:10 -07:00
Christian
899b28bffe Updated FML:
MinecraftForge/FML@dac7f590ea Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due to NPE.
MinecraftForge/FML@f0dc530b28 Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class
MinecraftForge/FML@243a21a353 Wrapping coremods as tweakers. Part 1.
MinecraftForge/FML@58a299aabc Attempt to inject coremods as tweakers, so both can share a dependency ordering
2013-10-27 13:53:05 -04:00
Lex Manos
217d5562ff Fix null pointer exception in BiomeDictionary causing the ChunkManager's config to not load/save. 2013-10-19 18:31:32 -07:00
Lex Manos
b0f8d495bb Updated FML: MinecraftForge/FML@bf54d4d667 Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:30:19 -07:00
Lex Manos
295542c357 Add wildcard versions of OreDict replacements, Closes #827 2013-10-18 18:58:31 -07:00
Christian
4db6c4cfc4 Updated FML:
MinecraftForge/FML@da4337efbf Fix up handling the new method signature data for NetworkCheckHandlers
2013-10-14 21:30:43 -04:00
Christian
efc6b9abbb Merge branch 'master' of github.com:OniBait/MinecraftForge into breakevent 2013-10-13 23:02:20 -04:00
Christian
430d94de95 Updated FML:
MinecraftForge/FML@f92962bbbb Use null to empty, so missing values work. *sigh*
2013-10-13 22:44:15 -04:00
Christian
e0cb56381f And remember to make the event class static *sigh* 2013-10-13 12:23:08 -04:00
Christian
f9c283a2e5 Add in an event for zombie summoning. Allows for mods to control summoning behaviour, as well as custom summoned mob. 2013-10-13 12:21:57 -04:00
Christian
6c45b43eee And set the RIGHT variable *sigh* 2013-10-13 11:55:15 -04:00
Christian
de69b7dfd0 And allow for tweaking baby chance as well. 2013-10-13 11:53:48 -04:00
Christian
5f5b509c7a Allow configuration of the zombie additional summoning mechanic. The vanilla mechanic is a little borked at times. 2013-10-13 11:39:23 -04:00
Christian
29606e2c39 Updated FML:
MinecraftForge/FML@58577775d2 Very minor style fixes
MinecraftForge/FML@96be82343c Merge pull request #280 from mc10/patch-1
MinecraftForge/FML@2714da1022 Primitive capability for tweakers to order. Add a "TweakOrder" integer property to your manifest, or accept the default of zero.
2013-10-13 11:33:41 -04:00
Lex Manos
412952be5b Prevent session from being printed to the console, also make sure the username is not empty. Causes a lot of bugs further down the line. 2013-10-12 23:10:23 -07:00
OniBait
79e0165362 Cleaned up patches to BlockOre and BlockRedstoneOre
Fixed trailing whitespace (it bugs me too)
2013-10-10 17:15:38 -05:00
OniBait
e47a6402e1 Fixed formatting 2013-10-10 12:45:56 -05:00
Christian
465525119c Updated FML:
MinecraftForge/FML@fc3e7647d2 Support, and fix up, interface lists for Optional
2013-10-09 21:00:07 -04:00
Lex Manos
43a16d5389 Added some missing air checks to world gen features. 2013-10-09 02:47:05 -07:00