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

4819 commits

This branch
This branch
All branches
Author SHA1 Message Date
RainWarrior
7c7547227c Perspective awareness for vanilla and multi models, fixes #2148. 
Improved error handling in MultiModel.
 2015-10-27 17:40:05 +03:00
Fry
cf568ae85f Merge pull request #2091 from shadekiller666/ItemModelLoadingFix 
Fixed a bug with item model loading
 2015-10-27 09:59:50 +03:00
RainWarrior
8c82b0296a Small fix for reworked classic lighting 2015-10-27 00:19:04 +03:00
shadekiller666
33e2e0b028 Fixed a bug with item model loading that would occur if ModelBakery.addVariantName() was called with the same string location parameter for 2 different items, and the string pointed to a location that didn't exist, where ModelLoader.loadAnyModel() would substitute the blockdefinition in for the item model, but wouldn't remove the original input location from the loadingModels list, which would cause the location from the second call to throw an IllegalStateException even though that location now has a model. 2015-10-26 10:15:13 -07:00
shadekiller666
d1b220f6a3 Added OBJ loader for the ModelLoaderRegistry system. 2015-10-26 19:38:49 +03:00
RainWarrior
d5a658b5ea Added back in the lost class 2015-10-26 19:32:19 +03:00
RainWarrior
dd365d7220 Model pipeline system. 
Should replace all ad-hoc quad generation methods in forge, and make IBakedModel -> WorldRenderer data transfer faster. Added IVertexConsumer + helper classes; lighting that works correctly for non-axis-aligned faces using the new infrastructure. Changed smooth lighting algorithm, now it should work correctly for everything.
New block lighter can be disabled in the forge config options.
 2015-10-26 19:25:48 +03:00
Bernhard Bonigl
336eaa336b Fix Potion IDs above 127 2015-10-25 12:16:17 +01:00
mezz
ebdcc11c80 Allow server to access Potion isBadEffect() 2015-10-12 21:35:15 -07:00
LexManos
ebe9b6d4cb Merge pull request #2022 from simon816/guava-apache-lcl-exclusion 
Add Guava and Apache to LaunchClassLoader exclusion list on server
 2015-10-12 12:29:45 -07:00
LexManos
7cc7ce3ba2 Merge pull request #2129 from darkevilmac/master 
Add PlayerSetSpawnEvent
 2015-10-11 14:52:02 -07:00
darkevilmac
b9f5e152de Add PlayerSetSpawnEvent 2015-10-10 15:39:27 -07:00
Take Weiland
76753c06df Fix CME when entities are spawned from EntityJoinWorldEvent 2015-10-04 18:46:47 +02:00
RainWarrior
e280f72cfb '#' is now added automatically to the beginning of the texture names in B3D models, and the remapping is expected via the blockstate JSON, since it's more reasonable than adding it to the file name in the modelling program or matching the resource location with the filename. 2015-10-03 04:42:35 +03:00
RainWarrior
d71384bc33 Fixes Attributes.transform affecting only 1 vertex. 2015-09-29 02:29:16 +03:00
LexManos
605457deec Merge pull request #2103 from olee/patch-1 
Fix possible crash in EventBus
 2015-09-27 14:41:29 -07:00
LexManos
90829a3164 Merge pull request #2120 from luacs1998/eventbus_fix 
Fix a possible crash in EventBus
 2015-09-27 02:12:50 -07:00
luacs1998
05f6ede2ea Fix a possible crash in EventBus 2015-09-27 12:47:37 +08:00
LexManos
1e7fbb7018 Merge pull request #2118 from rubensworks/itemmonsterplacer-dispenser 
Fix dispenser action for modded spawn eggs
 2015-09-22 12:18:26 -07:00
Ruben Taelman
385159c25e Fix dispenser action for modded spawn eggs 2015-09-22 19:53:34 +02:00
Lex Manos
fb9ffa40fd Fix entity count being incorrect for spawning logic. Now filter out 'persistant' entities. 2015-09-14 13:18:34 -07:00
Lex Manos
eacffb2b6e Update Gradle wrapper to 2.7 2015-09-14 13:18:02 -07:00
LexManos
fb7b47adb4 Merge pull request #2002 from ganymedes01/master 
Disallow conflicting furnace recipes
 2015-09-09 11:23:08 -07:00
RainWarrior
d70ca1a357 Workaround for MinecraftForge/ForgeGradle#256 2015-09-02 22:01:30 +03:00
ganymedes01
31a3a18ec7 Disallow conflicting furnace recipes 2015-09-02 19:04:57 +01:00
cpw
5074f26ccd FMLNetworkHandler.openGui should not try and open a GUI on a FakePlayer. 
Fixes #2082 and probably dozens of mod errors. Also, side benefit of the
merged codebase! FML code can ref Forge code!
 2015-09-02 13:50:00 -04:00
cpw
4315637f75 Merge branch 'laci200270-patch-1' 2015-09-02 13:30:00 -04:00
cpw
b7e8dcff7b Format a bit better 2015-09-02 13:29:43 -04:00
cpw
5a9129f802 Merge branch 'patch-1' of https://github.com/laci200270/MinecraftForge into laci200270-patch-1 2015-09-02 13:27:42 -04:00
RainWarrior
b175d265b9 Much requested temporary hack for items and TESRs. Context: #1582, #1597, #1713, #2058 and others. 2015-09-02 07:35:24 +03:00
LexManos
e5ee9377fd Merge pull request #2086 from Vorquel/master 
Fix faulty channel name checking
 2015-09-01 16:32:26 -07:00
LexManos
edcb45640f Merge pull request #2069 from simon816/profile-request-fix 
Use already provided profile for the player's own skin
 2015-09-01 16:32:07 -07:00
simon816
d61a55b661 Use already provided profile for the player's own skin 2015-08-31 03:28:59 +01:00
simon816
b312584ca4 Add Guava and Apache to LaunchClassLoader exclusion list on server 
Move exclusions to common place. Less likely to get out of sync
 2015-08-31 03:15:30 +01:00
Björn Zeutzheim
ac5c7124de Fix possible crash in EventBus 
There is currently no way to check if an event handler has been registered or not.
But when trying to unregister a not-registered event handler, Minecraft crashes with a NullPointerException.
This is a simple fix to prevent such crashes.
 2015-08-31 03:39:33 +09:00
cpw
57d575f941 More cleanup of the default eclipse workspace. The project is now called "MDKExample" not "Minecraft". 
The project tree is now contemporary, instead of a copy from 1.5.x era MC. The launches are cleaned up, and refer to
a better default "runDir" of "run" rather than "eclipse".. Updating to FG2.0.1 which will contain relevant binary fixes.
 2015-08-26 21:57:31 -04:00
cpw
d41e51f47b Fix eclipse workspace inside the mdk - don't run it through the tokenconverter. Also add in CREDITS-fml.txt to the MDK - it's still required. 2015-08-26 13:57:51 -04:00
Lex Manos
90a88efd8a Fixed issue where config folder would not be created before SplashProgress tried to read from it. 
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
 2015-08-22 18:55:32 -07:00
Lex Manos
4b299529b7 Update gradle wrapper and fix changelog task. 2015-08-22 17:57:12 -07:00
James
589465bb81 Fix faulty Channel name 2015-08-21 16:06:07 -07:00
cpw
0d320e2e31 Fix crowdin again. Run, jenkins, for god's sake, run! 2015-08-21 09:52:33 -07:00
cpw
4903febd96 Fix crowdin task. Good luck jenkins, lets roll! 2015-08-21 09:43:30 -07:00
cpw
bbe96a3577 Fix ciWriteBuildNumber task. Ugly, but it works. 2015-08-20 13:42:58 -07:00
cpw
b211aca5ce Merge branch 'fg2' 2015-08-20 12:27:20 -07:00
cpw
58ab3de7c1 Remove patches 2015-08-20 12:14:02 -07:00
laci200270
ba8ae53867 Update FMLSecurityManager.java 2015-08-19 20:27:42 +02:00
cpw
7e600c0dd8 Fix packaging the gradle wrapper properly. There is still a problem with 
the MDK- it fails to run setupDecompWorkspace.

Filed an issue at ForgeGradle, since this seems to be something FG2 shouldn't
be doing, but is?

https://github.com/MinecraftForge/ForgeGradle/issues/235
 2015-08-15 10:16:00 -07:00
cpw
9a0a00c7a4 Trying to fix the MDK to include gradle wrapper, but the gradle-wrapper.jar is 
corrupted. @AbrarSyed can you take a look?
 2015-08-15 09:56:56 -07:00
cpw
91927e6bc7 The final nail in the coffin. BYE! 2015-08-13 23:07:53 -07:00
cpw
fc045f210d Fix MDK task - it now runs. 2015-08-13 23:07:17 -07:00