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

1947 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
246152d3c4 Fixed hashcode in FluidContainerRegistry, still needs a redesign. Closes #967 2014-02-23 16:56:29 -08:00
LexManos
ee7aa93416 Merge pull request #978 from iChun/master 
Add cancelable RenderHandEvent.
 2014-02-21 10:28:37 -08:00
iChun
bad0639e90 Add cancelable RenderHandEvent. 2014-02-22 01:13:40 +08:00
Lex Manos
6f49bba302 Fix a typo in our tile entity fix causing it to be ineffective. 2014-02-20 12:04:27 -08:00
Lex Manos
b01d87f0c6 Fix items with color rendering incorrectly. 2014-02-19 12:34:21 -08:00
Christian
08a636c34f Update Forge for patch changes 
MinecraftForge/FML@064b66af3d Prevent players from logging in until server has finished starting.
MinecraftForge/FML@2aa73afa15 Fix ExampleMod.java for build #1024+
MinecraftForge/FML@c890206268 Try and handle removal of mods a bit better. Currently no way to allow a world which has missing blocks to load - but i have the code in place to allow it i think.
MinecraftForge/FML@995c204338 Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load when stuff is missing, but for right now, it will fail as this is "world safe".
MinecraftForge/FML@fa5f4c8842 Some argumentation
MinecraftForge/FML@45409bfa0c Prevent player dat files getting reset during disconnects.
MinecraftForge/FML@33100d6bab Merge pull request #371 from bl4ckscor3/patch-1
MinecraftForge/FML@572d32358a Merge pull request #373 from bloodmc/master
MinecraftForge/FML@d0dd05a15c FML expands S3F to support payloads up to 2 megs in size. Should be transparent
 2014-02-18 21:03:44 -05:00
Lex Manos
3322996885 Fixeed a missed -1 in SpawnerAnimals patch. Thanks Blood. 2014-02-12 23:06:11 -08:00
Lex Manos
b43d63a7ad Cull FakePlayers when worlds are unloaded. 2014-02-11 18:25:33 -08:00
Lex Manos
c8e0b4a193 Use correct tag types when reading Forced Chunk data. Fixes ticket loading. Closes #964 2014-02-10 16:16:03 -08:00
Lex Manos
c4972b7658 Fixed FluidContainerRegisry.contansFluid closes #845 2014-02-10 15:29:36 -08:00
Lex Manos
8462f3b17c Fix AIOOB error with Endermen and blocks >256. Also better support for ID remapping. More to come later. 2014-02-07 19:15:05 -08:00
Lex Manos
1e2c63f486 Add the beginnings of a Constants class, to document/clean some of the magic numbers that are in the MC code base. 2014-02-05 01:14:57 -08:00
Lex Manos
e68577ffd3 Updated FML: 
MinecraftForge/FML@03fb1879d7 Fix obf error when right clicking a Empty Map.
MinecraftForge/FML@6bb9b8b953 Clean up FMLEventChannel. Closes #367.
MinecraftForge/FML@b7b3450dcd Update MCP mapping snapshot to latest crowdsourced names.
MinecraftForge/FML@8c9e8b5270 Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it.
 2014-02-05 01:14:24 -08:00
Christian
9d919f8ac9 Fix up the event handler so it knows it's owned by forge 2014-02-02 12:34:34 -05:00
Christian
67d9dac16d Add a discriminator for fluididspacket. remove extraneous channel handler. 2014-02-02 12:19:37 -05:00
Christian
978bfd6eb1 MinecraftForge/FML@d87822ad85 Bump gradle wrapper to 1.10 
MinecraftForge/FML@359ac3ca2a Ensure we check both item and block registries when finding valid IDs. Should fix #365
MinecraftForge/FML@cee0f0b811 Tweak so that writing to the context will automatically send a message back to the originator in handshakeestablished.
 2014-02-02 12:18:32 -05:00
Lex Manos
539ee0ea88 Fixed missed parens causing trapdoors to fall off incorrectly. 2014-01-31 15:12:19 -08:00
Lex Manos
f85ab543ee Fixed issue where enchantment effects caused slight rendeirng issue. 2014-01-31 14:32:32 -08:00
Lex Manos
51414375e4 Uncomment aa few FluidRegistry entries. 2014-01-29 21:04:34 -08:00
Lex Manos
2b9a2b5c1a Inital Fluid system update, untested. Still in progress. 2014-01-29 18:34:23 -08:00
Lex Manos
51b008c391 Attempt a AIOOB error fix in tesselator when there are alot of transparent blocks in the rendering range. 2014-01-29 16:17:31 -08:00
Lex Manos
0d84da021f Fix NPE when breaking ice. 2014-01-29 15:43:13 -08:00
Christian
3059e517c5 MinecraftForge/FML@544320b8d2 Beginning of a saveinspectionhandler. 
MinecraftForge/FML@ab199c5811 Try harder to find a mod container.
MinecraftForge/FML@8633d780c9 And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen for coremods not properly registering their code. Closes #363
 2014-01-25 06:30:12 -05:00
Lex Manos
f8f1b4211b Fix imporerly efficient tools breaking blocks to fast. 2014-01-24 21:43:47 -08:00
Lex Manos
30a390d4bf Adds a WeatherRender in the style of SkyRender, Closes #844 2014-01-24 19:38:33 -08:00
Lex Manos
790030ab05 Fixed potential NPE in SlotCrafting, and added ItemStack sensitive version fo hasContainerItem. Closes #854 2014-01-24 19:30:17 -08:00
Lex Manos
d73f4fb7b3 Move change of metadata to immediatly after change of Block, should prevent any 'invalid' tile entities from breaking created. Reference: #897 2014-01-24 19:21:59 -08:00
Lex Manos
6f7ac27c96 New PlayerUseItemEvents, Start, Stop, Tick and Finish. See PlayerUseItemEvent.java for more details. Closes #924 2014-01-24 19:10:51 -08:00
Lex Manos
6ae2353f41 Don't short circuit item icons for multiple render passes while being used. Closes #929 2014-01-24 17:23:49 -08:00
Lex Manos
c62061728b Add the ability for custom records to have finer control over there sound resource location. Closes #933 2014-01-24 17:16:35 -08:00
Lex Manos
796b53f549 Exclude cobblestone slab recipe from ore dictification, closes #940 2014-01-24 16:44:23 -08:00
Lex Manos
6c6f664c30 Implement PlayerPickupXpEvent, fired when a player aquires XP from a EntityXPOrb. Closes #942 2014-01-24 16:31:38 -08:00
Lex Manos
2e47771860 Missing EntityAITasks.tasks and MapgGenStructreIO register ATs, Closes #949 2014-01-24 16:04:41 -08:00