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

2281 commits

This branch
This branch
All branches
Author SHA1 Message Date
CovertJaguar
5f6e1167f4 Fix issue with flexible rail return value 
Between 1.6 and 1.7 the return value to BlockRailBase.isFlexibleRail()
was inverted. While this is not a huge deal and could be worked around
by simply inverting your return value, it does mean its no longer
consistent with the function name and javadocs.
 2014-04-29 14:07:59 -07:00
Christian
63a205c043 No, this is not me modding either. I'm doing this as a favour for Lex, who's a bit computerless at the minute. 
MinecraftForge/FML@77c254a6d9 I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated..
MinecraftForge/FML@7f01cf549b I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit.
MinecraftForge/FML@2b8d0f6680 Fix SimpleNetworkWrapper - this is not me modding, I didn't realize it was broken until Pahimar told me.
MinecraftForge/FML@ddee7eb117 Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash
MinecraftForge/FML@59a5adfdb3 Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation
MinecraftForge/FML@d88b2aa0c5 prevent the world from getting saved twice at shutdown
MinecraftForge/FML@9b1cbab03b Registry: Crash earlier with conflicting name/object registrations.
MinecraftForge/FML@7ba167c500 Registry: Misc tweaks
MinecraftForge/FML@78248da399 Registry: Treat all 1.6 entries as items.
 2014-04-28 15:59:30 -04:00
LexManos
022cefc72a Merge pull request #1044 from bspkrs/patch-1 
Fixed typo in update checker
 2014-04-20 03:52:55 -07:00
bspkrs
3fa0c70f2b get a spelling checker :P 2014-04-18 11:21:40 -04:00
Lex Manos
a008339c6e Bump Forge version in prep for release. 2014-04-16 17:30:50 -07:00
Lex Manos
172ea90c59 Try and fix invalid framebuffer depth/stencil setup, Thanks Ivoforce. Closes #1032 2014-04-15 12:03:31 -07:00
LexManos
cc08cb46c8 Merge pull request #1038 from planetguy32/master 
Fix infinite loop in RecipeSorter
 2014-04-15 14:47:36 -04:00
planetguy32
fd59ab261f Fix infinite loop in RecipeSorter 
If recipe is multiple levels of inheritance from Object and not categorized, cls=cls.getSuperclass(); needs to be repeated more than once. It must therefore be moved to inside the while loop.
 2014-04-12 20:04:02 -07:00
LexManos
2cef9c5cb2 Merge pull request #1029 from iChun/patch-1 
Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher.
 2014-04-07 10:43:02 -07:00
iChun
cc54645bf3 Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher. 2014-04-08 01:09:17 +08:00
Lex Manos
2b40a5e3ce Small wording change in license to allow for specifc differnet licnense contributions. 
Updated FML:
MinecraftForge/FML@e58562d3ed Fix remaining issue with autoassigned Block and Item IDs overlapping.
MinecraftForge/FML@a82195772e Registry: Block IDs after failing to find a mapping for them
MinecraftForge/FML@fd9389015f Fix FMLMissingMappingsEvent.get
MinecraftForge/FML@5eebd4df71 Registry: Implement support for remapping blocks/items to a new name.
MinecraftForge/FML@7325aa5033 Registry: cleanup, fix missing id error GUI formatting
MinecraftForge/FML@eb29d651eb Fix old 1.7 worlds with broken ID mappings
MinecraftForge/FML@6fd3c12a4a Registry: allow handling missing blocks/items regardless of the mod id
MinecraftForge/FML@038fa17ad3 Merge branch 'master' of https://github.com/MinecraftForge/FML
MinecraftForge/FML@49c623f59c initial attempt at a better way to ask the user in case of startup issues
MinecraftForge/FML@9be92dcfcb Registry: Complain about bogus registrations
MinecraftForge/FML@fd6d55afcc Registry: Allow ignoring missing mods from the GUI, with confirm+backup
  Registry: Add confirm+backup for automated corrupted id table fixup Require the user to confirm loading from a backup level.dat
MinecraftForge/FML@c47fc3b382 Enable custom gui rendering only as required
MinecraftForge/FML@f77632df35 Remove unneeded entity spawn debug logging.
MinecraftForge/FML@c7adb42199 Registry: Repair mismatched ItemBlocks as well Fix a few misc issues
MinecraftForge/FML@c8a245a985 Registry: Fix debug info
MinecraftForge/FML@c8a0b72eba Registry: Complain about missing mods when repairing broken worlds Registry: Reduce console spam
MinecraftForge/FML@8e44006f43 Registry: Protect against putObject misuse, handle duplicate registrations better
MinecraftForge/FML@294c93212c Registry: Add support for registering ItemBlocks before their Blocks
MinecraftForge/FML@3b42b33b6e Merge pull request #400 from sfPlayer1/master
 2014-04-07 10:01:56 -07:00
LexManos
ae81ad58ea Merge pull request #1028 from alexbegt/patch-1 
Small Fix: Held Items & Multiple Render Passes
 2014-04-06 16:34:58 -07:00
Alexander Behrhof
36298e2bfe Small Fix: Held Items & Multiple Render Passes 
Passes beyond 1 now have the correct icon.
 2014-04-06 17:29:23 -04:00
Lex Manos
7b19768c4c Fix line offset in Minecraft patch, and mix RenderPlayer looping once to many on multi-pass items. 2014-04-04 14:20:56 -07:00
LexManos
094d80fe66 Merge pull request #1024 from ShetiPhian/patch-1 
Add a variable for SoundCategory in PlaySoundEvent17
 2014-04-03 19:59:56 -07:00
ShetiPhian
bba42d4230 Update PlaySoundEvent17.java 2014-04-03 22:25:49 -04:00
Lex Manos
621fb050ce Finally do SoundSystem workup for 1.7, Closes #982 2014-04-03 03:12:22 -07:00
Lex Manos
5fbc70173c Add NPE protection to GuiingameMenu.actionPerformed, Closes #961 2014-04-03 02:11:17 -07:00
Lex Manos
72d22c5827 Update access transformer, Closes #951 and #1021 2014-04-03 02:10:43 -07:00
Lex Manos
12e8d95e9f Fix potential threading issue if FluidRegistry.loopupFluidForBlock is called from two threads at the same time before being setup. Closes #936 2014-04-02 23:53:05 -07:00
Lex Manos
14b9d639a2 Use BiomeGenBase's array size instead of hardcoding it in BiomeDictionary. Closes #871 2014-04-02 23:46:52 -07:00
Lex Manos
5f62afb5f2 Add AnvilUpdateEvent which is fired when a user places a item in both input slots of a Anvil and allows modders to control the output. Closes #838 2014-04-02 18:33:13 -07:00
Lex Manos
33bf2c8a69 Add ANIMALS tpe to PopulateChunkEvent.Populate Custom providers should call this function if they spawn animals curing population. Closes #790 2014-04-02 17:40:03 -07:00
Lex Manos
56084b584d ItemStack sensitive version of Item.getAttributeModifiers, Closes #816 2014-04-02 17:24:25 -07:00
Lex Manos
b0bfea4e03 New hook to truely seperate the display of the 'durability' bar from the current / max durability. Allowing modders to control that display easier. 2014-04-02 17:08:22 -07:00
Lex Manos
aa0c902d22 Advanced Model Loader available server-side for data driven models. To be cleanuped and re-evaluated in 1.8. Closes #773 2014-04-01 15:02:06 -07:00
Lex Manos
d9a1c718bf Add position to BreakSpeed event. Closes #621 2014-04-01 15:00:25 -07:00
Lex Manos
f436b3e62d Update patches for new Fixed FernFlower used in FG 1.2. 2014-03-31 16:48:21 -07:00
LexManos
8576fe6dbe Merge pull request #1012 from AbrarSyed/master 
Updated for ForgeGradle 1.2
 2014-03-31 16:05:09 -07:00
AbrarSyed
1d2d0ea5cd fixed remaining noop patches and exc derp 2014-03-29 01:52:11 -05:00
AbrarSyed
5d43695710 updated FML to latest master 2014-03-29 01:14:24 -05:00
AbrarSyed
0e1a1202d8 added .exe file.. fixed a bunch of patches 2014-03-29 01:12:45 -05:00
AbrarSyed
9d3a274cb6 updated for ForgeGradle 1.2 2014-03-25 10:15:42 -05:00
AbrarSyed
2a2e201f4a COnverted patches to SRG names 2014-03-25 10:13:57 -05:00
luacs1998
7f1b938cae Update CONTRIBUTING.md 
Add link to wiki page on contributing
 2014-03-19 23:33:36 +08:00
luacs1998
132d53583d Create CONTRIBUTING.md 
Simple file (which github will show for those making PRs) containing guidelines for making PRs.
Feel free to comment if you want/need anything added. I can pull the same thing to FML too if you'd like, Lex.
 2014-03-19 23:26:02 +08:00
LexManos
0620a64813 Merge pull request #998 from Eurymachus/master 
This correctly uses the world height less one block for placement of a door
 2014-03-15 16:31:57 -05:00
Eurymachus
05afb0c347 This correctly uses the world height less one block for placement of a 
Door.

Required for placing doors inside a littleblocks area.
 2014-03-12 13:26:48 +00:00
Lex Manos
185b9f8368 MinecraftForge/FML@ef07de4f65 Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting. 2014-03-11 00:55:57 -07:00
Lex Manos
ea2c07c727 -.- Both null combinations. 2014-03-10 23:41:37 -07:00
Lex Manos
1a9e13f880 properly implement equals, sod off Player. 2014-03-10 23:27:30 -07:00
Lex Manos
d97ec2763c Implement simple hash based equals in Fluid ContainerKey. 2014-03-10 22:51:31 -07:00
Lex Manos
534b241e9f Make StructureVillagePieces.Village public. 2014-03-10 22:12:46 -07:00
LexManos
0513182e3c Merge pull request #995 from iChun/master 
Fixes stencil bits not existing in Minecraft's framebuffer causing stencil test to not work.
 2014-03-10 17:42:55 -05:00
iChun
741a90c6bd Fixes stencil bits not existing in Minecraft's framebuffer causing stencil test to not work. 2014-03-11 06:40:37 +08:00
Lex Manos
68eb0d15dc Updated FML: 
MinecraftForge/FML@e8b60441cc Reload game settings after mod loading is finished to capture mod keybindings. Closes #378
MinecraftForge/FML@399770e572 Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any futureevents added.
MinecraftForge/FML@b7ad532ab5 Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase.
 2014-03-09 13:44:36 -07:00
LexManos
8660d0471f Merge pull request #983 from DemoXinMC/master 
Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone
 2014-03-01 12:06:08 -08:00
LexManos
0a6dc66749 Merge pull request #984 from ShetiPhian/item-renderer-fix 
Small Fix: Held Items & Multiple Render Passes
 2014-02-28 05:03:41 -08:00
DemoXin
488eb30272 * Fixed Items.glowstone to Items.glowstone_dust 2014-02-28 02:54:50 -05:00
Timothy Tomkins
d2d2032f93 Small Fix: Held Items & Multiple Render Passes 
Passes beyond 1 now have the correct icon.
 2014-02-27 23:57:44 -05:00