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

5261 commits

This branch
This branch
All branches
Author SHA1 Message Date
LexManos
0d13fe245d Add NPE protection to in-hand item rendering. 2016-05-04 22:29:17 -07:00
Matthew Messinger
5f74a75435 Fix url regex (#2815) 
Fixed url detection in chat messages. Stops false positives such as `um.....no`
 2016-05-04 10:46:33 -07:00
LexManos
aa672ea69a Bump version for new RB. 2016-05-03 23:19:51 -07:00
LexManos
42404c531d Slightly better practice because wait can be randomly interupted. 2016-05-03 23:19:40 -07:00
cpw
4248dbc71d Merge in a fix from 1.8.9 for rails 2016-05-03 23:39:32 -04:00
cpw
f5781488d9 Merge branch '1.9' 2016-05-03 23:24:43 -04:00
LexManos
3177d55579 Remove usage of AsynchronousExecutor library in favor or a simpler implementation. 2016-05-03 19:54:04 -07:00
LexManos
d8249b7886 Add a java version detection and nag system for users on Java 7 or below. 
Added detection of mods that rely on Java 8 and a graceful error screen.
The nag screen will be shown once a day. It can be disabled by editing the forge.cfg.
However it is HIGHLY recomended that user update to Java 8.
 2016-05-03 18:26:52 -07:00
LexManos
4d27393c91 Fix withers breaking bedrock. Closes #2813 2016-05-03 16:13:17 -07:00
RainWarrior
e98cd386e0 Fixed villager profession not being set correctly on the client, and fixed custom village texture rendering. Closes #2766. 2016-05-03 11:39:14 +03:00
RainWarrior
4538062e70 Fixed cooldown overlay sometimes rendering opaque. Closes #2772. 2016-05-03 11:03:30 +03:00
RainWarrior
f3fdf4303a Make ChunkRenderDispatcher.countRenderBuilders configurable. Closes #2775. 2016-05-03 10:28:06 +03:00
RainWarrior
330812dfa8 Fixed custom fluid sufraces not rendering from the bottom. Closes #2800. 2016-05-03 09:53:55 +03:00
AlexIIL
980845b61b Fix TextureMap failing when registering a sprite's resource location twice (#2785) 2016-05-03 10:07:49 +04:00
bloodmc
5a20950902 Call markDirty when restoring blocks with TileEntities. (#2809) 
This change makes sure the updated tileentity is saved properly within the
chunk.
 2016-05-02 15:21:59 -07:00
bloodmc
23cdcb96a9 Call markDirty when restoring blocks with TileEntities. (#2808) 
This change makes sure the updated tileentity is saved properly within the
chunk.
 2016-05-02 15:18:26 -07:00
bloodmc
b53e53dcb7 Call markDirty when restoring blocks with TileEntities. (#2807) 
This change makes sure the updated tileentity is saved properly within the
chunk.
 2016-05-02 15:01:49 -07:00
Vincent Lee
9f28c90365 Add Potion.renderHUDEffect (#2798) 2016-05-02 14:44:14 -07:00
bloodmc
7c6372202e Fix wrong blockstate being passed to notifyNeighborsRespectDebug. (#2806) 2016-05-02 14:33:35 -07:00
bloodmc
b5bda7117a Only run block physics for TileEntities while capturing block placement. (#2805) 
Currently, all blocks placed by players that are not TE's run physics
twice. Blocks that contain a TileEntity are not affected due to a check in
'ForgeHooks.onPlaceItemIntoWorld'.

In order to fix the problem, 'Chunk.setBlockState' will now verify if
blocks are being captured before running onBlockAdded and if so, only run
physics if the block has a tileentity. This check also prevents blocks
such as TNT's from running its physics (explosion) when placement event is
cancelled.
 2016-05-02 14:23:24 -07:00
bloodmc
d9bdaef468 Only run block physics for TileEntities while capturing block placement. (#2803) 
Currently, all blocks placed by players that are not TE's run physics
twice. Blocks that contain a TileEntity are not affected due to a check in
'ForgeHooks.onPlaceItemIntoWorld'.

In order to fix the problem, 'Chunk.setBlockState' will now verify if
blocks are being captured before running onBlockAdded and if so, only run
physics if the block has a tileentity. This check also prevents blocks such
as TNT's from running its physics (explosion) when event is cancelled.
 2016-05-02 14:21:37 -07:00
LexManos
26b5059396 Fix sluggish scrolling on GuiScrollList's and fix small rendering issue with scroll bar on certian screen sizes. 2016-05-02 14:13:33 -07:00
boni
8fdd76bae1 Fix SidedInvWrapper accessing wrong slots for setStackInSlot. (#2797) 
Fix DoubleChestItemHandler not implementing IItemHandlerModifiable
 2016-05-02 12:19:54 -07:00
mezz
9c9107c434 Close #2780 add CMD localization for Mac key bindings (#2792) 2016-04-29 12:04:48 -07:00
cpw
84bfeddc1c Update LICENSE-new.txt 
Better words
 2016-04-28 15:24:34 -04:00
cpw
d9e0a653e0 Update LICENSE-new.txt 
Words
 2016-04-28 15:23:03 -04:00
cpw
c519812ea1 Update LICENSE-new.txt 
Clarification on infectivity
 2016-04-28 15:22:24 -04:00
cpw
e8098133ea Add the new license text. Not yet applicable to forge. 2016-04-28 15:15:50 -04:00
LexManos
d090c2834b Fix NPE on shield break. Closes #2786 2016-04-27 18:37:54 -07:00
Vincent Lee
35999f9a20 Boss bar render event (#2701) 
Allow control over increment height
 2016-04-14 22:34:45 -07:00
iTitus
fa21f2b44c Fix forge:default-block transformation. (#2760) 
The first-person left-hand rotation was a little bit of.
 2016-04-13 22:53:25 +04:00
LexManos
205f5c13c8 Expose a central place to access all of Vanilla and Forge's registries using the new registry API. 2016-04-09 22:33:39 -07:00
mezz
c560af69a5 Fix log spam from invalid key modifiers (#2746) 2016-04-09 17:02:03 -07:00
Kina
68cd48287b make WorldSavedData implement NBTSerializable (#2745) 2016-04-09 16:09:06 -07:00
Matthew Prenger
2a3774def3 Don't use import static with net.minecraft classes. Using the latest MCP snapshots this causes an import conflict. (#2742) 2016-04-09 16:03:46 -07:00
mezz
a018e14939 Add cancelable event for Potions shifting the gui position (#2667) 
Add cancelable event for Potions shifting the gui position
 2016-04-08 20:18:17 -07:00
Matti Ruohonen
03584ec411 Fix ForgeChunkManager world unloading check (#2736) 2016-04-07 15:39:55 -07:00
LexManos
2a4067a539 Fix being kicked from server when climbing ladders. 2016-04-07 13:12:10 -07:00
LexManos
8fefac110e Fix potential desync between Forge's Villager profession and vanilla's int based system. 2016-04-07 12:29:00 -07:00
Craig Burton
d31cf8ddbc Update ore dictionary (#2721) 
Updated the Ore Dictionary with more vanilla items:
  -Prismarine Shard ( "gemPrismarine" )
  -Prismarine Crystals ( "dustPrismarine" )
  -Prismarine Block ( "blockPrismarine" )
  -Prismarine Brick ( "blockPrismarineBrick" )
  -Dark Prismarine ( "blockDarkPrismarine" )
  -Nether Wart ( "cropNetherWart" )
  -Sugarcane ( "sugarcane" )
  -Paper ( "paper" )
  -Ender Pearl ( "enderpearl" )
  -Bone ( "bone)
  -Gunpowder ( "gunpowder)
  -String ( "string" )
  -Nether Star ( "netherStar" )
  -Leather ( "leather" )
  -Feather ( "feather" )
  -Egg ( "egg" )
  -End Stone ( "endstone" )
  -Torch ( "torch" )
  -Vine ( "vine" )
  -Cactus ( "blockCactus" )
  -Grass ( "grass")
  -Obsidian ( "obsidian" )
  -Red Sandstone ( added to "sandstone" )
  -Crafting Table ( "workbench" )
  -Slime Block ( "blockSlime" )
  -Granite ( "stoneGranite" )
  -Polished Granite ( "stoneGranitePolished" )
  -Diorite ( "stoneDiorite" )
  -Polished Diorite ( "stoneDioritePolished" )
  -Andesite ( "stoneAndesite" )
  -Polished Andesite ( "stoneAndesitePolished" )
 2016-04-07 11:49:31 -07:00
LexManos
fbe628d058 Merge pull request #2729 from kashike/feature/bossinfo 
Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods
 2016-04-06 16:19:18 -07:00
kashike
72edc41a7c Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods 
These methods can also be used by the server (see BossInfoServer, it sends packets to the client but the methods are @SideOnly(Side.CLIENT))
 2016-04-06 15:57:54 -07:00
RainWarrior
db04370830 Made forge fluids use smooth lighting. 2016-04-06 16:13:51 +03:00
LexManos
7973984227 Fixed NPE in dedicated server languages. And fixed logger for main FML event bus. 2016-04-06 02:11:27 -07:00
LexManos
07a2b67b7f Cleanup OBJLoader parse function and fix issues related to JVM differences. 
Also fix support for sopme of the spec that was partially respected.
 2016-04-06 01:45:43 -07:00
LexManos
fb0bdd1276 Enhance some error logging related to OBJLoader issues, and RegistryEntries. 2016-04-06 01:44:08 -07:00
Fry
a48fd56fdc Merge pull request #2723 from mezz/pick-fix 
Fix some plain keybinds not working when a modifier is active
 2016-04-06 10:11:07 +04:00
mezz
e68908e9d5 Fix some plain keybinds not working when a modifier is active 2016-04-05 23:01:26 -07:00
LexManos
045e8bf806 Merge pull request #2719 from mezz/pick-fix 
Fix #2717 Pick block hotkey not working in inventories
 2016-04-05 18:30:39 -07:00
mezz
7587ca7c71 Fix #2717 Pick block hotkey not working in inventories 2016-04-05 18:25:25 -07:00