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

4389 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Player
407f6f79af 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
 2014-04-01 21:56:53 +02:00
Player
3eaa002091 Registry: Complain about bogus registrations 2014-04-01 14:40:24 +02:00
Player
11ab034638 initial attempt at a better way to ask the user in case of startup issues 2014-04-01 14:30:47 +02:00
Player
e013f1514d Merge branch 'master' of https://github.com/MinecraftForge/FML 
Conflicts:
	src/main/java/cpw/mods/fml/client/FMLClientHandler.java
	src/main/java/cpw/mods/fml/client/GuiModItemsMissing.java
	src/main/java/cpw/mods/fml/common/FMLContainer.java
	src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
	src/main/java/cpw/mods/fml/common/registry/GameData.java
 2014-04-01 07:00:20 +02: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
Lex Manos
0586c2b1aa Update patches for Fixed FF in FG 1.2. 2014-03-31 16:02:54 -07:00
Player
56f31def7b Registry: allow handling missing blocks/items regardless of the mod id 2014-03-31 04:09:59 +02:00
Player
d392ddf3be Fix old 1.7 worlds with broken ID mappings 2014-03-30 17:17:54 +02: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
Player
939a095896 Registry: cleanup, fix missing id error GUI formatting 2014-03-27 08:30:55 +01:00
LexManos
e35a3538a6 Merge pull request #392 from AbrarSyed/master 
Updated to ForgeGradle 1.2
 2014-03-26 16:04:30 -07:00
AbrarSyed
ed79732705 updated wrapper to gradle 1.11 2014-03-26 13:34:25 -05:00
AbrarSyed
4db8573645 updated example a little 2014-03-26 13:34:01 -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
Player
ac44af863b Registry: Implement support for remapping blocks/items to a new name. 2014-03-25 00:36:37 +01:00
Player
180c605570 Fix FMLMissingMappingsEvent.get 2014-03-24 21:47:25 +01:00
Player
e9ca678ab3 Registry: Block IDs after failing to find a mapping for them 2014-03-24 21:16:36 +01:00
Player
ff6083e77b Fix remaining issue with autoassigned Block and Item IDs overlapping. 2014-03-20 23:41:01 +01: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
AbrarSyed
ff6143dc85 updated for ForgeGradle 1.2 2014-03-19 02:15:53 -05:00
LexManos
0cd40e70b6 Update README.txt 2014-03-18 01:54:32 -05:00
Lex Manos
f632ea0c36 Fix network close events never getting called. Closes #381 #382 2014-03-15 18:16:27 -07: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
244e39df0c Fix long standing deobf issue that caused announce-player-achievements property to have no effect on dedicated servers. 2014-03-11 01:57:44 -07: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
9b615893d9 Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting. 2014-03-11 00:50:55 -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
Lex Manos
d3d244f4a2 Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase. 2014-03-03 23:23:55 -08: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
DemoXin
58fde290f8 * Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone 2014-02-27 22:48:33 -05:00
Lex Manos
55199c25d8 Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any future events added. 2014-02-25 12:30:29 -08:00