diff --git a/client_version b/client_version index c4a94db..253f07a 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u10 \ No newline at end of file +u11 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java index fde4d7b..9183079 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiCustomizeSkin.edit.java @@ -11,4 +11,12 @@ ~ protected void actionPerformed(GuiButton parGuiButton) { +> CHANGE 27 : 32 @ 27 : 28 + +~ /* +~ * TODO: I changed this to getUnformattedText() from getFormattedText() because +~ * the latter was returning a pink formatting code at the end for no reason +~ */ +~ return playerModelParts.func_179326_d().getUnformattedText() + ": " + s; + > EOF diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 9a1dfa1..ba161fe 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -8,7 +8,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u10"; + public static final String projectForkVersion = "u11"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -23,7 +23,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u10"; + public static final String projectOriginVersion = "u11"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; diff --git a/sources/resources/assets/eagler/glsl/post_fxaa.fsh b/sources/resources/assets/eagler/glsl/post_fxaa.fsh index b77e15f..03e562e 100644 --- a/sources/resources/assets/eagler/glsl/post_fxaa.fsh +++ b/sources/resources/assets/eagler/glsl/post_fxaa.fsh @@ -283,16 +283,12 @@ void main(){ vec2 screenSize05 = 0.5 * u_screenSize2f; vec4 posPos; - posPos.xy = v_position2f - screenSize05; - posPos.zw = v_position2f + screenSize05; + posPos.xy = v_position2f; + posPos.zw = v_position2f + u_screenSize2f; vec4 rcpFrameOpt; rcpFrameOpt.xy = -screenSize05; rcpFrameOpt.zw = screenSize05; - vec4 rcpFrameOpt2; - rcpFrameOpt2.xy = -2.0 * u_screenSize2f; - rcpFrameOpt2.zw = -rcpFrameOpt2.xy; - - output4f = vec4(FxaaPixelShader(v_position2f + screenSize05, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt2, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0); + output4f = vec4(FxaaPixelShader(v_position2f + screenSize05, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt * 4.0, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0); }