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
LexManos
61f9c5a201 Merge pull request #1885 from LexManos/EnhanvedBlockStateJson 
Hook BlockState's Json loading to add support for simplified Forge format.
 2015-06-02 16:52:06 -07:00
Lex Manos
267e1ee62f Hook BlockState's Json loading to add support for simplified Forge format. 
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
 2015-06-02 16:49:56 -07:00
Lex Manos
950da28d54 Fixed missing import in last merge. 2015-06-02 16:32:10 -07:00
cpw
e2dc863086 Merge branch '1.7.10' 
Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
	fml/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
 2015-06-02 07:30:44 -04:00
cpw
f8cb411df1 So we can't print a lot of unicode in the splash screen, so restrict to a hard subset we know we CAN print, closes #1910 2015-06-02 07:24:26 -04:00
LexManos
41cae458a4 Merge pull request #1911 from AlgorithmX2/ItemFramesOnSolidSurfaces 
Allow placing item frames on Solid Block Faces (isSideSolid)
 2015-06-01 20:45:28 -07:00
AlgorithmX2
885d7602f9 Allow placing item frames on Solid Block Faces (isSideSolid) 2015-06-01 22:31:55 -05:00
Lex Manos
e6eeb03108 Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662 
(cherry picked from commit 19d7e16fa6)

Conflicts:
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
 2015-06-01 17:15:06 -04:00
Lex Manos
f088b1b460 Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message. 
(cherry picked from commit e3211eec04)

Conflicts:
	fml/src/main/java/cpw/mods/fml/client/SplashProgress.java
 2015-06-01 17:09:28 -04:00
cpw
3c640fa32d Bump minor version # to 2 because of the fluid changes (mirroring what happening in 1.7.10) 2015-06-01 16:31:16 -04:00
cpw
d02636213a Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8 
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	fml/src/main/java/net/minecraftforge/fml/common/Loader.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	patches/minecraft/net/minecraft/item/ItemArmor.java.patch
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/WorldProvider.java.patch
	src/main/java/net/minecraftforge/common/ForgeVersion.java
	src/main/java/net/minecraftforge/common/network/ForgeMessage.java
	src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
	src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
	src/main/java/net/minecraftforge/fluids/FluidRegistry.java
	src/main/java/net/minecraftforge/oredict/OreDictionary.java
 2015-06-01 16:29:34 -04:00
cpw
bd6630810f Add in an ItemStackHolder - a way to inject ItemStacks without having to have complex lookup code everywhere. 
Example: https://gist.github.com/cpw/9af398451a20459ac263
 2015-05-30 14:07:54 -04:00
Lex Manos
3331d2a496 Fixed damage reduction rate of vanilla armor incorrectly scaling with armor's current durability. 2015-05-26 23:34:32 -07:00
LexManos
f9b1e4e23b Merge pull request #1892 from AlgorithmX2/vanilla_lighting_bug 
Fix Vanilla Lighting Bug - Fixes Top/Bottom Faces interpolation.
 2015-05-26 19:24:37 -07:00
Lex Manos
2bb090bf2b Force netty downgrade on dedicated server to match client. Netty bug: https://github.com/netty/netty/issues/2302 Closes #1848 2015-05-26 19:20:46 -07:00
AlgorithmX2
76f8843017 Fix Partial Face Lighting on Top/Bottom Faces ; Vanilla MC-80148 2015-05-26 19:33:56 -05:00
Lex Manos
9fa51447a2 Fixed command exploit with C12 2015-05-25 16:08:42 -07:00
Lex Manos
c608e7c04e Fixes MC-75630 - Exploit with signs and command blocks 2015-05-25 15:28:14 -07:00
Lex Manos
19d7e16fa6 Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662 2015-05-25 14:32:35 -07:00
Lex Manos
e3211eec04 Attempt to disable the new splash screen if there are errors detected finishing up. Print a slightly more helpful error message. 2015-05-25 13:34:35 -07:00
Lex Manos
89994bda39 Cleanup a lot of spammy output. Everything hidden behind environment flags now. Scale anvil image down 50% 2015-05-25 13:34:34 -07:00
Lex Manos
df5e594e95 Loosen up ServerChatEvent to support IChatComponent Closes #1893 2015-05-25 13:34:34 -07:00
LexManos
8d7b999506 Merge pull request #1804 from Prototik/font 
Add true support for unicode fonts
 2015-05-21 10:43:22 -07:00
Prototik
2798fc4e49 Add true support for unicode fonts 2015-05-21 20:14:56 +07:00
LexManos
61b2929ae6 Merge pull request #1886 from diesieben07/texture-load-crash 
Fix crash when texture loading throws RuntimeException without message
 2015-05-20 12:19:18 -07:00
diesieben07
1501f467cf Fix crash when texture loading throws RuntimeException without message 2015-05-20 17:43:52 +02:00
LexManos
d3ab6d36a4 Merge pull request #1882 from t1g3l/master 
Changed forge command tab completion to use getListOfStringsMatchingL…
 2015-05-18 10:08:46 -07:00
t1g3l
6a299a483a Changed forge command tab completion to use getListOfStringsMatchingLastWord() 2015-05-18 13:51:05 +02:00
LexManos
8944983d0f Merge pull request #1878 from t1g3l/master 
Added tab completion to /forge command.
 2015-05-17 14:55:39 -07:00
cpw
06398fa259 Clean up transformers a bit. Can't use COMPUTE_FRAMES even though it's required - the game refuses to even 
run if I do. Note for j8: when we force Java8 classes, all coremods will need a thorough overhaul - the
current way we do things is not sustainable when Java8 becomes the universal norm.
 2015-05-17 10:35:56 -04:00
cpw
3bbf5c04a6 Strip control codes in progress bar messages. They cause crashes sometimes. 2015-05-17 10:15:44 -04:00
t1g3l
fe327fbd76 Added tab completion 2015-05-17 11:00:42 +02:00
cpw
686db5e5eb Hardcode the FML version in-game as a specific value. 2015-05-16 13:43:35 -04:00
cpw
5fe653cf82 Attempt to fix the slow loading problem. Instead of forcing the main thread to wait around 
on every call to processWindowMessages, we will simply skip it, if the mutex is already
claimed by the display thread. This should fix slow loading issues seen by some with
the new loading screen.
 2015-05-16 12:55:15 -04:00
cpw
58fdfb6fa1 Fix patches after last fml merge. 2015-05-14 13:56:10 -04:00
cpw
dca8a4a550 Merged FML @ 1.7.10 2015-05-13 20:00:48 -04:00
cpw
cb6f92e3c7 Merged FML 2015-05-11 18:46:21 -04:00
cpw
081a949bfd Merge branch '1.7.10' 
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
	src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
	src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
	src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
	src/main/java/net/minecraftforge/fml/common/LoadController.java
	src/main/java/net/minecraftforge/fml/common/Loader.java
	src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
	src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
	src/main/resources/fml_at.cfg
 2015-05-10 23:55:11 -04:00
LexManos
1f679be553 Merge pull request #1863 from Tmtravlr/master 
Initialized the Nether Fortress chest loot
 2015-05-10 16:04:07 -07:00
Tmtravlr
b2de64bc70 Initialized the Nether Fortress chest loot 
Forced the nether fortress chest loot to initialize in ChestGenHooks
like the other types.

Changed tabs to spaces. Silly Eclipse.
 2015-05-10 15:59:07 -07:00
cpw
228ce68639 Update current json 2015-05-08 13:54:11 -04:00
cpw
4270f0fb4a MinecraftForge/FML@0b84b6aa29 Expose the state of the loader 2015-05-07 14:24:14 -04:00
cpw
dd49a0cd84 Merge branch '1710ls' into 1.7.10 2015-05-07 14:23:37 -04:00
cpw
76c7177553 Expose the state of the loader 2015-05-07 14:17:45 -04:00
Fry
7ab952d410 Merge pull request #1853 from Silfadur/master 
Added hook for  IPerspectiveAwareModel in RenderItem.renderItemIntoGUI f...
 2015-05-05 04:22:01 +03:00
Silfadur
b756bd5f9a Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI 2015-05-05 02:23:38 +02:00
RainWarrior
88a7c0b233 Updated FML: 
MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore.
MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
MinecraftForge/FML@91338433fa Add classloader exclusion for ASM
MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes MinecraftForge/FML#651
MinecraftForge/FML@8ccfa24764 Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10
MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen.
MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now.
MinecraftForge/FML@dda4313539 Revert "Merge pull request MinecraftForge/FML#650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10.
MinecraftForge/FML@5dbb481732 Eliminated texture name allocation race condition
MinecraftForge/FML@450b82ca0e Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed
 2015-05-04 22:18:38 +03:00
RainWarrior
c28794fe38 Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed 2015-05-04 22:10:36 +03:00
RainWarrior
fb18c07722 Eliminated texture name allocation race condition 2015-05-04 21:54:33 +03:00
cpw
1b1fbbb70d MinecraftForge/FML@dda4313539 Revert "Merge pull request #650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. 2015-05-04 09:26:09 -04:00